2002-01-22 22:03:04 +00:00
|
|
|
/* Font.java -- Font object
|
2004-04-22 05:34:30 +00:00
|
|
|
Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
|
1999-05-05 04:05:57 -07:00
|
|
|
|
2002-01-22 22:03:04 +00:00
|
|
|
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.
|
|
|
|
|
2002-01-22 22:58:09 +00:00
|
|
|
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. */
|
1999-05-05 04:05:57 -07:00
|
|
|
|
|
|
|
|
|
|
|
package java.awt;
|
|
|
|
|
Font.java [...]: New versions from classpath.
2003-06-19 Michael Koch <konqueror@gmx.de>
* java/awt/Font.java
javax/swing/UIManager.java
javax/swing/border/AbstractBorder.java
javax/swing/border/BevelBorder.java
javax/swing/border/Border.java
javax/swing/border/CompoundBorder.java
javax/swing/border/EmptyBorder.java
javax/swing/border/EtchedBorder.java
javax/swing/border/LineBorder.java
javax/swing/border/MatteBorder.java
javax/swing/border/TitledBorder.java
javax/swing/plaf/BorderUIResource.java
javax/swing/plaf/basic/BasicBorders.java
javax/swing/plaf/basic/BasicButtonUI.java
javax/swing/plaf/basic/BasicCheckBoxUI.java
javax/swing/plaf/basic/BasicGraphicsUtils.java
javax/swing/plaf/basic/BasicLabelUI.java
javax/swing/plaf/basic/BasicRadioButtonUI.java
javax/swing/plaf/basic/BasicToggleButtonUI.java:
New versions from classpath.
* javax/swing/border/SoftBevelBorder.java:
New file from classpath.
* javax/swing/border/doc-files/LineBorder-1.png,
javax/swing/border/doc-files/BevelBorder-1.png,
javax/swing/border/doc-files/BevelBorder-2.png,
javax/swing/border/doc-files/BevelBorder-3.png,
javax/swing/border/doc-files/EmptyBorder-1.png,
javax/swing/border/doc-files/EtchedBorder-1.png,
javax/swing/border/doc-files/EtchedBorder-2.png,
javax/swing/border/doc-files/MatteBorder-1.png,
javax/swing/border/doc-files/MatteBorder-2.png,
javax/swing/border/doc-files/MatteBorder-3.png,
javax/swing/border/doc-files/MatteBorder-4.png,
javax/swing/border/doc-files/MatteBorder-5.png,
javax/swing/border/doc-files/MatteBorder-6.png,
javax/swing/border/doc-files/SoftBevelBorder-1.png,
javax/swing/border/doc-files/SoftBevelBorder-2.png,
javax/swing/border/doc-files/SoftBevelBorder-3.png,
javax/swing/plaf/basic/doc-files/BasicBorders.MarginBorder-1.png,
javax/swing/plaf/basic/doc-files/BasicBorders.ButtonBorder-1.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-1.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-2.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-3.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-4.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-5.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-6.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-7.png:
New binary files from classpath.
* Makefile.am
(awt_java_source_files): Added
javax/swing/border/SoftBevelBorder.java.
* Makefile.in: Regenerated.
From-SVN: r68190
2003-06-19 10:48:46 +00:00
|
|
|
import java.awt.font.FontRenderContext;
|
2003-08-13 16:49:58 +00:00
|
|
|
import java.awt.font.GlyphVector;
|
Font.java [...]: New versions from classpath.
2003-06-19 Michael Koch <konqueror@gmx.de>
* java/awt/Font.java
javax/swing/UIManager.java
javax/swing/border/AbstractBorder.java
javax/swing/border/BevelBorder.java
javax/swing/border/Border.java
javax/swing/border/CompoundBorder.java
javax/swing/border/EmptyBorder.java
javax/swing/border/EtchedBorder.java
javax/swing/border/LineBorder.java
javax/swing/border/MatteBorder.java
javax/swing/border/TitledBorder.java
javax/swing/plaf/BorderUIResource.java
javax/swing/plaf/basic/BasicBorders.java
javax/swing/plaf/basic/BasicButtonUI.java
javax/swing/plaf/basic/BasicCheckBoxUI.java
javax/swing/plaf/basic/BasicGraphicsUtils.java
javax/swing/plaf/basic/BasicLabelUI.java
javax/swing/plaf/basic/BasicRadioButtonUI.java
javax/swing/plaf/basic/BasicToggleButtonUI.java:
New versions from classpath.
* javax/swing/border/SoftBevelBorder.java:
New file from classpath.
* javax/swing/border/doc-files/LineBorder-1.png,
javax/swing/border/doc-files/BevelBorder-1.png,
javax/swing/border/doc-files/BevelBorder-2.png,
javax/swing/border/doc-files/BevelBorder-3.png,
javax/swing/border/doc-files/EmptyBorder-1.png,
javax/swing/border/doc-files/EtchedBorder-1.png,
javax/swing/border/doc-files/EtchedBorder-2.png,
javax/swing/border/doc-files/MatteBorder-1.png,
javax/swing/border/doc-files/MatteBorder-2.png,
javax/swing/border/doc-files/MatteBorder-3.png,
javax/swing/border/doc-files/MatteBorder-4.png,
javax/swing/border/doc-files/MatteBorder-5.png,
javax/swing/border/doc-files/MatteBorder-6.png,
javax/swing/border/doc-files/SoftBevelBorder-1.png,
javax/swing/border/doc-files/SoftBevelBorder-2.png,
javax/swing/border/doc-files/SoftBevelBorder-3.png,
javax/swing/plaf/basic/doc-files/BasicBorders.MarginBorder-1.png,
javax/swing/plaf/basic/doc-files/BasicBorders.ButtonBorder-1.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-1.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-2.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-3.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-4.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-5.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-6.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-7.png:
New binary files from classpath.
* Makefile.am
(awt_java_source_files): Added
javax/swing/border/SoftBevelBorder.java.
* Makefile.in: Regenerated.
From-SVN: r68190
2003-06-19 10:48:46 +00:00
|
|
|
import java.awt.font.LineMetrics;
|
2003-08-13 16:49:58 +00:00
|
|
|
import java.awt.font.TextAttribute;
|
2003-12-31 08:58:31 +00:00
|
|
|
import java.awt.font.TransformAttribute;
|
2003-08-13 16:49:58 +00:00
|
|
|
import java.awt.geom.AffineTransform;
|
|
|
|
import java.awt.geom.Rectangle2D;
|
2003-06-24 10:50:21 +00:00
|
|
|
import java.awt.peer.FontPeer;
|
2003-08-13 16:49:58 +00:00
|
|
|
import java.io.InputStream;
|
|
|
|
import java.io.IOException;
|
2003-02-15 09:21:55 +00:00
|
|
|
import java.io.Serializable;
|
2003-08-13 16:49:58 +00:00
|
|
|
import java.util.Locale;
|
|
|
|
import java.util.Map;
|
2003-12-31 08:58:31 +00:00
|
|
|
import java.util.HashMap;
|
2002-01-22 22:03:04 +00:00
|
|
|
import java.util.StringTokenizer;
|
2003-08-13 16:49:58 +00:00
|
|
|
import java.text.CharacterIterator;
|
|
|
|
import java.text.AttributedCharacterIterator;
|
2003-12-31 08:58:31 +00:00
|
|
|
import java.text.StringCharacterIterator;
|
|
|
|
|
|
|
|
import gnu.java.awt.ClasspathToolkit;
|
|
|
|
import gnu.java.awt.peer.ClasspathFontPeer;
|
2002-01-22 22:03:04 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* This class represents a windowing system font.
|
|
|
|
*
|
|
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
|
|
* @author Warren Levy <warrenl@cygnus.com>
|
2003-12-31 08:58:31 +00:00
|
|
|
* @author Graydon Hoare <graydon@redhat.com>
|
2002-01-22 22:03:04 +00:00
|
|
|
*/
|
2003-02-15 09:21:55 +00:00
|
|
|
public class Font implements Serializable
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Static Variables
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constant indicating a "plain" font.
|
|
|
|
*/
|
|
|
|
public static final int PLAIN = 0;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constant indicating a "bold" font.
|
|
|
|
*/
|
|
|
|
public static final int BOLD = 1;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constant indicating an "italic" font.
|
|
|
|
*/
|
|
|
|
public static final int ITALIC = 2;
|
|
|
|
|
2003-08-13 16:49:58 +00:00
|
|
|
/**
|
|
|
|
* Constant indicating the baseline mode characteristic of Roman.
|
|
|
|
*/
|
2002-01-22 22:03:04 +00:00
|
|
|
public static final int ROMAN_BASELINE = 0;
|
2003-08-13 16:49:58 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Constant indicating the baseline mode characteristic of Chinese.
|
|
|
|
*/
|
2002-01-22 22:03:04 +00:00
|
|
|
public static final int CENTER_BASELINE = 1;
|
2003-08-13 16:49:58 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Constant indicating the baseline mode characteristic of Devanigri.
|
|
|
|
*/
|
|
|
|
public static final int HANGING_BASELINE = 2;
|
2002-01-22 22:03:04 +00:00
|
|
|
|
2002-08-09 04:26:17 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Indicates to <code>createFont</code> that the supplied font data
|
|
|
|
* is in TrueType format.
|
|
|
|
*
|
|
|
|
* <p><em>Specification Note:</em> The Sun JavaDoc for J2SE 1.4 does
|
|
|
|
* not indicate whether this value also subsumes OpenType. OpenType
|
|
|
|
* is essentially the same format as TrueType, but allows to define
|
|
|
|
* glyph shapes in the same way as PostScript, using cubic bezier
|
|
|
|
* curves.
|
|
|
|
*
|
|
|
|
* @since 1.3
|
|
|
|
*/
|
|
|
|
public static final int TRUETYPE_FONT = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A flag for <code>layoutGlyphVector</code>, indicating that the
|
|
|
|
* orientation of a text run is from left to right.
|
|
|
|
*
|
|
|
|
* @since 1.4
|
|
|
|
*/
|
|
|
|
public static final int LAYOUT_LEFT_TO_RIGHT = 0;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A flag for <code>layoutGlyphVector</code>, indicating that the
|
|
|
|
* orientation of a text run is from right to left.
|
|
|
|
*
|
|
|
|
* @since 1.4
|
|
|
|
*/
|
|
|
|
public static final int LAYOUT_RIGHT_TO_LEFT = 1;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A flag for <code>layoutGlyphVector</code>, indicating that the
|
|
|
|
* text does not contain valid characters before the
|
|
|
|
* <code>start</code> position. If this flag is set,
|
|
|
|
* <code>layoutGlyphVector</code> does not examine the text before
|
|
|
|
* <code>start</code>, even if this would be necessary to select the
|
|
|
|
* correct glyphs (e.g., for Arabic text).
|
|
|
|
*
|
|
|
|
* @since 1.4
|
|
|
|
*/
|
|
|
|
public static final int LAYOUT_NO_START_CONTEXT = 2;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A flag for <code>layoutGlyphVector</code>, indicating that the
|
|
|
|
* text does not contain valid characters after the
|
|
|
|
* <code>limit</code> position. If this flag is set,
|
|
|
|
* <code>layoutGlyphVector</code> does not examine the text after
|
|
|
|
* <code>limit</code>, even if this would be necessary to select the
|
|
|
|
* correct glyphs (e.g., for Arabic text).
|
|
|
|
*
|
|
|
|
* @since 1.4
|
|
|
|
*/
|
|
|
|
public static final int LAYOUT_NO_LIMIT_CONTEXT = 4;
|
|
|
|
|
|
|
|
|
2002-01-22 22:03:04 +00:00
|
|
|
// Serialization constant
|
|
|
|
private static final long serialVersionUID = -4206021311591459213L;
|
|
|
|
|
|
|
|
|
2003-12-31 08:58:31 +00:00
|
|
|
// The ClasspathToolkit-provided peer which implements this font
|
|
|
|
private ClasspathFontPeer peer;
|
2002-01-22 22:03:04 +00:00
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Static Methods
|
|
|
|
*/
|
2000-07-12 03:32:07 +00:00
|
|
|
|
2000-03-17 00:45:06 +00:00
|
|
|
/**
|
2002-01-22 22:03:04 +00:00
|
|
|
* Creates a <code>Font</code> object from the specified string, which
|
|
|
|
* is in one of the following formats:
|
|
|
|
* <p>
|
|
|
|
* <ul>
|
|
|
|
* <li>fontname-style-pointsize
|
|
|
|
* <li>fontname-style
|
|
|
|
* <li>fontname-pointsize
|
|
|
|
* <li>fontname
|
|
|
|
* </ul>
|
|
|
|
* <p>
|
|
|
|
* The style should be one of BOLD, ITALIC, or BOLDITALIC. The default
|
|
|
|
* style if none is specified is PLAIN. The default size if none
|
|
|
|
* is specified is 12.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public static Font decode (String fontspec)
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
|
|
|
String name = null;
|
|
|
|
int style = PLAIN;
|
|
|
|
int size = 12;
|
|
|
|
|
|
|
|
StringTokenizer st = new StringTokenizer(fontspec, "-");
|
|
|
|
while (st.hasMoreTokens())
|
|
|
|
{
|
|
|
|
String token = st.nextToken();
|
|
|
|
if (name == null)
|
|
|
|
{
|
|
|
|
name = token;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (token.toUpperCase().equals("BOLD"))
|
|
|
|
{
|
|
|
|
style = BOLD;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (token.toUpperCase().equals("ITALIC"))
|
|
|
|
{
|
|
|
|
style = ITALIC;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (token.toUpperCase().equals("BOLDITALIC"))
|
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
style = BOLD | ITALIC;
|
2002-01-22 22:03:04 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
int tokenval = 0;
|
|
|
|
try
|
|
|
|
{
|
|
|
|
tokenval = Integer.parseInt(token);
|
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
catch(NumberFormatException e) { ; }
|
2002-01-22 22:03:04 +00:00
|
|
|
|
|
|
|
if (tokenval != 0)
|
|
|
|
size = tokenval;
|
|
|
|
}
|
|
|
|
|
2003-12-31 08:58:31 +00:00
|
|
|
return getFontFromToolkit (name, attrsToMap (style, size));
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
2003-12-31 08:58:31 +00:00
|
|
|
/* These methods delegate to the toolkit. */
|
|
|
|
|
|
|
|
protected static ClasspathToolkit tk ()
|
|
|
|
{
|
|
|
|
return (ClasspathToolkit)(Toolkit.getDefaultToolkit ());
|
|
|
|
}
|
|
|
|
|
|
|
|
protected static Map attrsToMap(int style, int size)
|
|
|
|
{
|
|
|
|
Map attrs = new HashMap();
|
|
|
|
attrs.put (TextAttribute.SIZE, new Float ((float)size));
|
|
|
|
|
|
|
|
if ((style & BOLD) == BOLD)
|
|
|
|
attrs.put (TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD);
|
|
|
|
else
|
|
|
|
attrs.put (TextAttribute.WEIGHT, TextAttribute.WEIGHT_REGULAR);
|
|
|
|
|
|
|
|
if ((style & ITALIC) == ITALIC)
|
|
|
|
attrs.put (TextAttribute.POSTURE, TextAttribute.POSTURE_OBLIQUE);
|
|
|
|
else
|
|
|
|
attrs.put (TextAttribute.POSTURE, TextAttribute.POSTURE_REGULAR);
|
|
|
|
return attrs;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Every factory method in Font should eventually call this. */
|
|
|
|
protected static Font getFontFromToolkit (String name, Map attribs)
|
|
|
|
{
|
|
|
|
return tk ().getFont (name, attribs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Every Font constructor should eventually call this. */
|
|
|
|
protected static ClasspathFontPeer getPeerFromToolkit (String name, Map attrs)
|
|
|
|
{
|
|
|
|
return tk ().getClasspathFontPeer (name, attrs);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-01-22 22:03:04 +00:00
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a <code>Font</code> object from the passed property name.
|
|
|
|
*
|
|
|
|
* @param propname The name of the system property.
|
|
|
|
* @param default Value to use if the property is not found.
|
|
|
|
*
|
|
|
|
* @return The requested font, or <code>default</code> if the property
|
|
|
|
* not exist or is malformed.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public static Font getFont (String propname, Font defval)
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
|
|
|
String propval = System.getProperty(propname);
|
|
|
|
if (propval != null)
|
2003-12-31 08:58:31 +00:00
|
|
|
return decode (propval);
|
|
|
|
return defval;
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a <code>Font</code> object from the passed property name.
|
|
|
|
*
|
|
|
|
* @param propname The name of the system property.
|
|
|
|
*
|
|
|
|
* @return The requested font, or <code>null</code> if the property
|
|
|
|
* not exist or is malformed.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public static Font getFont (String propname)
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return getFont (propname, (Font)null);
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Constructors
|
2000-03-17 00:45:06 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
2002-01-22 22:03:04 +00:00
|
|
|
* Initializes a new instance of <code>Font</code> with the specified
|
|
|
|
* attributes.
|
|
|
|
*
|
|
|
|
* @param name The name of the font.
|
|
|
|
* @param style The font style.
|
|
|
|
* @param size The font point size.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
|
|
|
|
public Font (String name, int style, int size)
|
|
|
|
{
|
|
|
|
this.peer = getPeerFromToolkit (name, attrsToMap (style, size));
|
|
|
|
}
|
|
|
|
|
|
|
|
public Font (Map attrs)
|
[multiple changes]
2004-03-12 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Clipping fixes.
* javax/swing/JComponent.java (paint): Use persistent double buffer.
* javax/swing/JList.java (ListListener): Revalidate on changes.
* javax/swing/JScrollPane.java: Reimplement.
* javax/swing/JViewport.java: Reimplement.
* javax/swing/ScrollPaneLayout.java: Reimplement.
* javax/swing/ViewportLayout.java: Tidy up.
* javax/swing/plaf/basic/BasicButtonListener.java: Remove printlns.
* javax/swing/plaf/basic/BasicScrollPaneUI.java: Reimplement.
* javax/swing/plaf/basic/BasicSliderUI.java: Handle missing labels.
* javax/swing/plaf/basic/BasicViewportUI.java: Implement in terms of
backing store only.
2004-03-11 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(window_wm_protocols_filter): New function.
(window_focus_in_cb): Remove function.
(window_focus_out_cb): Likewise.
(window_focus_or_active_state_change_cb): New function.
(create): Add filter that removes WM_TAKE_FOCUS client messages.
(connectSignals): Don't attach handlers to focus-in-event or
focus-out-event signals. Handle notify signal.
2004-03-11 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetLabel): New native method declaration.
(setLabel): Use gtkSetLabel.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel): New method.
2004-03-10 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Default to
black when color argument is null.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: Remove check
for drag events.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild):
Remove candidate clip. Use the component
clip to intersect.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Use the PaintEvent's clip.
2004-03-10 Kim Ho <kho@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Don't set the clip for the
Graphics object.
2004-03-09 Graydon Hoare <graydon@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c:
Fix double <-> fixed macros, reset font transform.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:
Likewise.
2004-03-09�� Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild): Move
the x and y coordinate of the component rectangle
to correct position.
(handleEvent): Forward drag events to the pressed
component.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Fix comments.
(ArrowButtonListener::mousePressed): Stop the
existing timer.
(mouseDragged): Implement.
(TrackListener::mousePressed): Only react if
the press doesn't occur on the thumb, otherwise
just set the offset.
(TrackListener::mouseReleased): Unset the isAdjusting
value.
(createIncreaseIcon): Switch icon.
(createDecreaseIcon): Switch icon.
(calculatePreferredSize): Use width.
(getThumbBounds): Use the top as the lower value.
(layoutVScrollBar): Switch the button locations.
(paintIncreaseHighlight): Paint correct side of thumb.
(paintDecreaseHighlight): ditto.
(valueForYPosition): Use top as the lower value.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix comments.
(mouseDragged): Implement.
(mousePressed): Only react when the thumb isn't
pressed, otherwise just set offset.
(mouseReleased): Handle a release of the thumb.
(scrollDueToClickInTrack): Stop the timer first.
* javax/swing/JProgressBar.java:
(setString): Fix change condition.
* javax/swing/JSeparator.java:
Remove println's.
2004-03-08 David Jee <djee@redhat.com>
* java/awt/image/AffineTransformOp.java:
(filter): Use Graphics2D interface instead of directly using the
GdkGraphics2D peer.
2004-03-05 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkButtonPeer.java
(handleEvent): Action events are generated upon MOUSE_RELEASED.
* java/awt/Container.java
(acquireComponentForMouseEvent): Fixed.
(handleEvent): Fixed.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(state_to_awt_mods_with_button_states): New method.
(pre_event_handler): Fixed mouse event generation.
2004-03-05 Olga Rodimina <rodimina@redhat.com>
gnu/java/awt/peer/gtk/GdkGraphics2D.java
(GdkGraphics2D (BufferedImage)): Initialize
pixmap associated with specified BufferedImage.
(setPaint): Changed implementation of Texture
Paint to use AffineTransformOp.
* java/awt/image/AffineTransformOp.java
(createCompatibleDestRaster): Throw RasterFormatException
if resulting width or height of raster is 0.
2004-03-04 Olga Rodimina <rodimina@redhat.com>
* java/awt/image/AffineTransformOp.java:
Removed unnecessary field interpolationType.
Formatted some of the lines to be consistent with
the GNU style.
(AffineTransformOp): Create new RenderingHints
containing specified interpolation type.
(createCompatibleDestImage): Implemented.
(createCompatibleDestRaster): Implemented.
(filter): Implemented.
(getBounds2D(BufferedImage)): Implemented.
(getBounds2D(Raster)): Implemented.
(getInterpolationType): Get interpolation value from
rendering hints.
2004-03-04 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): Check if child peers are null.
2004-03-04 Graydon Hoare <graydon@redhat.com>
* testsuite/lib/libjava.exp (libjava_find_lib): Don't include
.libs in -L option.
(libjava_arguments): Add new libraries to argument list.
2004-03-04 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (toolexeclib_LTLIBRARIES): Added lib-java-awt.la,
lib-javax-swing.la, lib-java-applet.la, lib-java-beans.la.
(misc_java_source_files): New macro.
(swing_java_source_files): Likewise.
(awt_java_source_files): Pruned.
(applet_java_source_files): New macro.
(beans_java_source_files): Likewise.
(lib_java_applet_la_SOURCES): Likewise.
(lib_java_awt_la_SOURCES): Likewise.
(lib_javax_swing_la_SOURCES): Likewise.
(lib_java_beans_la_SOURCES): Likewise.
(all_java_object_files): Likewise.
(%.lo: %.java): Use all_java_object_files.
(all_java_source_files): Added new _SOURCES.
(ordinary_java_source_files): Removed awt_java_source_files.
2004-03-02 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added java/awt/image/AffineTransformOp.java
* Makefile.in: Re-generated.
* java/awt/image/AffineTransformOp.java: New Class.
2004-03-01 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(setPaint): Interpret correctly TexturePaint's
anchor rectangle.
(drawImage): Fixed scale factors of the affine
transform.
2004-02-27 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java
(GdkGraphics(Component)): Inherit font from component.
(drawString): Use font style.
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetFont): New native method declaration.
(setFont): New method.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(gtkSetFont): New native method declaration.
(setFont): Call new native method gtkSetFont.
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): For all child components who do not their fonts set,
set their peers' fonts with this container's font.
* gnu/java/awt/peer/gtk/GtkLabelPeer.java:
Move all native method declarations to the top for readability.
(gtkSetFont): New native method declaration.
(setFont): New method.
* java/awt/Component.java
(setFont): Invalidate after setting the font.
* java/awt/Container.java
(invalidateTree): New method.
(setFont): Invalidate the container tree after setting the font.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString): Use font style.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
(Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont): New method.
2004-02-27 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(updateBufferedImage): New helper function.
Updates BufferedImage in memory if it was changed.
(draw): changed to update BufferedImage in memory after
this drawing operation
(fill): Ditto.
(draw3DRect): Ditto.
(fill3DRect): Ditto.
(clearRect): Ditto.
(drawRaster): Ditto.
(drawImage) : Ditto. Update only in case of GtkOffScreenImage with
no affine transformation.
(drawGlyphVector): Ditto.
2004-02-26 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(isBufferedImageGraphics): New Helper function.
Returns true if this graphics2d can be used to draw
into buffered image and false otherwise.
(updateImagePixels): New Helper function.
Updates pixels in the BufferedImage.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
(getImagePixels): New function. Returns pixels
of the buffered image associated with
this Graphics2D.
2004-02-26 David Jee <djee@redhat.com>
* java/awt/BorderLayout.java
(layoutContainer): Fix width and height calculations to ensure
that they're non-negative.
* java/awt/Component.java
(setBackground): If c is null, inherit from closest ancestor whose
background color is set.
2004-02-26�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Add new files.
* Makefile.in: Re-generate.
* javax/swing/JProgressBar.java:
(JProgressBar(int, int int)): Throw
IllegalArgumentException if orientation is
invalid.
(JProgressBar(BoundedRangeModel)): Create
ChangeListener and register it. UpdateUI.
(getChangeListeners): Implement.
(setModel): Reset ChangeListener.
* javax/swing/JScrollBar.java: Implement.
* javax/swing/JSeparator.java: Implement.
* javax/swing/JSlider.java:
(JSlider(int, int, int, int)): Throw
IllegalArgumentException if orientation
is invalid.
(getChangeListeners): Fix method name.
* javax/swing/SwingUtilities.java:
(layoutCompoundLabel): If there is no text,
set the text rectangle dimensions to 0.
* javax/swing/plaf/basic/BasicButtonUI.java:
(paint): If there is no text, don't paint it.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Implement.
* javax/swing/plaf/basic/BasicSeparatorUI.java:
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java:
(propertyChange): If the model changes, change
the listeners accordingly.
2004-02-25 Graydon Hoare <graydon@redhat.com>
* javax/swing/AbstractButton.java: Add "final" qualifiers.
* javax/swing/JList.java: Reimplement.
* javax/swing/DefaultListSelectionModel.java: Reimplement.
* javax/swing/plaf/basic/BasicListUI.java: Reimplement.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add "purple" values.
* javax/swing/ListModel.java: Javadoc.
* javax/swing/ListSelectionModel.java: Add missing methods.
* javax/swing/AbstractListModel.java: Javadoc and corrections.
* javax/swing/DefaultListModel.java: Javadoc and corrections.
* javax/swing/ListModel.java: Javadoc and corrections.
* javax/swing/DefaultListCellRenderer.java: Minor tidying.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer): Change default size to 12.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer): Change default size to 12.
(getClasspathFontPeer): Likewise. Set default name to "Default".
* java/awt/Font.java
(Font(Map)): Call Font(String,Map).
(Font(String,Map)): If attrs is null, initialize it as an empty
HashMap, which will ensure that the Font will get default attributes.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer(String,int)): Call the new constructor with size 1.
(GtkFontPeer(String,int,int)): New constructor with size attribute.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer(String,int)): Call the new overload method with size 1.
(getFontPeer(String,int,int)): New method. Overloaded with size
attribute.
(getClasspathFontPeer): Set the size of the font.
2004-02-24 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(bimage): New field.
(GdkGraphics2D): New Constructor. Constructs Graphics
object that can be used to draw into the Buffered Image.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
(GdkGraphicsEnvironment): Fixed to include public
keyword.
(createGraphics): Implemented.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getLocalGraphicsEnvironment): Implemented.
* java/awt/GraphicsEnvironment.java:
(getLocalGraphicsEnvironment): Implemented.
* java/awt/image/BufferedImage.java:
(createGraphics): Implemented.
2004-02-24 David Jee <djee@redhat.com>
* java/awt/Component.java
(eventTypeEnabled): Add MOUSE_MOVED and MOUSE_DRAGGED event types.
* java/awt/Container.java
(addNotifyContainerChildren): Fix event enabling.
2004-02-23 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added
gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
* Makefile.in: Re-generated.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
New Class.
2004-02-19 Kim Ho <kho@redhat.com>
* Makefile.am: Add BasicProgressBarUI
* Makefile.in: Regenerate.
* javax/swing/JProgressBar.java:
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java
Add constants for JProgressBar.
* javax/swing/plaf/basic/BasicProgressBarUI.java
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java
Change comments.
(calculateGeometry): New method
(paint): Remove unnecessary size calculations.
2004-02-18 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(drawRaster): Fixed small error that caused
imageToUser transformation to be set incorrectly.
(toString): Implemented.
2004-02-18 David Jee <djee@redhat.com>
* java/awt/CardLayout.java
(addLayoutComponent): Show the first component added as the default.
(removeLayoutComponent): After removing, show the next component.
(gotoComponent): If there is only one component, show it and return.
2004-02-18 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Re-order
modifiers.
* javax/swing/JLabel.java: Re-order
modifiers.
* javax/swing/JComponent.java:
(addPropertyChangeListener):
Implement.
(removePropertyChangeListener):
ditto.
(firePropertyChangeEvent):
ditto.
2004-02-17 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch ComponentEvent via system event queue.
(hide): Likewise.
(move): Likewise.
(resize): Likewise.
(reshape): Likewise.
* java/awt/Window.java
(setBoundsCallback): Likewise.
2004-02-17 David Jee <djee@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds):
Use gtk_widget_set_size_request() instead of the deprecated
gtk_widget_set_usize().
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Fix comments and
make property strings constants.
(createStandardLabels): Use the labels
preferred size as bounds.
* javax/swing/plaf/basic/BasicSliderUI.java
Fix comments.
(ScrollHandler::actionPerformed): Don't
calculate the timer stop value. Let the
MouseListeners find the stop location.
(getPreferredHorizontalSize): Re-implement.
(getPreferredVerticalSize): ditto.
(getMinimumHorizontalSize): ditto.
(getMinimumVerticalSize): ditto.
(getPreferredSize): ditto.
(getMinimumSize): ditto.
(getMaximumSize): ditto.
(paintTicks): Use doubles to find the
tick location.
(paintHorizontalLabel):�� Use preferredSize
as initial width and height.
(paintVerticalLabel): ditto.
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Changed
property strings to constants.
(DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY):
New property.
(setText): Change mnemonic index if
text is too short.
(setDisplayedMnemonicIndex): Fire property
change event.
(getDisplayedMnemonicIndex): Remove check
against short text.
2004-02-17 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(drawImage(img,xform,obs)): Invert xform before
passing the xform to cairo.
(drawImage(img,x,y,bgcolor,obs)): Implemented.
(drawImage (img,x,y,w,h,bgcolor,obs)): Partly
implemented.
(drawImage (img,x,y,w,h,obs)): Implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,
bgcolor,obs)): Partly implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,obs)):
Implemented.
* java/awt/image/BufferedImage.java:
(copyData): if dest is null, create raster with same
dimensions as the current image.
2004-02-16 Graydon Hoare <graydon@redhat.com>
* javax/swing/plaf/basic/BasicLabelUI.java
(getPreferredSize): Use layoutCL.
* javax/swing/plaf/basic/BasicGraphicsUtils.java
(getPreferredButtonSize): Start with empty view rect, layout using
component's preferred alignment.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add some Label and
List defaults.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch COMPONENT_SHOWN ComponentEvent.
(hide): Dispatch COMPONENT_HIDDEN ComponentEvent.
(move): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_MOVED ComponentEvent.
(resize): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_RESIZED ComponentEvent.
(reshape): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
* java/awt/Window.java
(setBoundsCallback): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
2004-02-16 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(setRenderingHint): Added implementation of
Interpolation rendering hints.
(setRenderingHints): Ditto.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
(drawPixels): fixed to allow user to choose type
of filtering that should be used when displaying images.
(cairoSurfaceSetFilter): New method. Sets filter type for
interpolation of pixel values.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(calcCellSizes): Rows or columns with zero sizes should still be
considered for extra space distribution.
2004-02-16 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Re-implement.
* javax/swing/plaf/basic/BasicLabelUI.java
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Added constant.
2004-02-16�� Kim Ho�� <kho@redhat.com>
* javax/swing/JSlider.java: Fix indentation and comments.
(setModel): Remove null check to conform with Sun's.
(setOrientation): Throw exception if not
HORIZONTAL or VERTICAL.
(getInverted): Use private variable instead of
ComponentOrientation.
(setInverted): ditto.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix indentation and comments.
(propertyChange): Remove check for inverted slider, handle
in main paint.
(getMinimumSize): Return preferred size.
(getMaximumSize): ditto.
(calculateFocusRect): Don't relocate rectangle.
(drawInverted): Return XOR of the slider's inversion and
the component's orientation.
(paint): Update leftToRightCache
2004-02-13 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(GetLayoutInfo): Fix weight and size distribution. Relocate repeated
code to helper methods.
(sortBySpan): New helper method.
(distributeSizeAndWeight): Likewise.
(calcCellWeights): Likewise.
(calcCellSizes): Add comments.
2004-02-13 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Only do something if component is invisible at the moment.
(hide): Only do something if component is visible at the moment.
(reshape): If lightweight, erase old bounds and repaint new bounds.
2004-02-13�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Updated for new file.
* Makefile.in: Regenerated.
* javax/swing/JSlider.java: Reimplement.
* javax/swing/SwingUtilities.java
(layoutCompoundLabel): Use icon height
instead of width.
(paintComponent): Implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Add JSlider defaults.
* javax/swing/plaf/basic/BasicSliderUI.java:
Implement. New file.
From-SVN: r79607
2004-03-17 21:29:02 +00:00
|
|
|
{
|
|
|
|
this(null, attrs);
|
|
|
|
}
|
2002-01-22 22:03:04 +00:00
|
|
|
|
2003-12-31 08:58:31 +00:00
|
|
|
/* This extra constructor is here to permit ClasspathToolkit and to build
|
|
|
|
a font with a "logical name" as well as attrs. */
|
|
|
|
public Font (String name, Map attrs)
|
[multiple changes]
2004-03-12 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Clipping fixes.
* javax/swing/JComponent.java (paint): Use persistent double buffer.
* javax/swing/JList.java (ListListener): Revalidate on changes.
* javax/swing/JScrollPane.java: Reimplement.
* javax/swing/JViewport.java: Reimplement.
* javax/swing/ScrollPaneLayout.java: Reimplement.
* javax/swing/ViewportLayout.java: Tidy up.
* javax/swing/plaf/basic/BasicButtonListener.java: Remove printlns.
* javax/swing/plaf/basic/BasicScrollPaneUI.java: Reimplement.
* javax/swing/plaf/basic/BasicSliderUI.java: Handle missing labels.
* javax/swing/plaf/basic/BasicViewportUI.java: Implement in terms of
backing store only.
2004-03-11 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(window_wm_protocols_filter): New function.
(window_focus_in_cb): Remove function.
(window_focus_out_cb): Likewise.
(window_focus_or_active_state_change_cb): New function.
(create): Add filter that removes WM_TAKE_FOCUS client messages.
(connectSignals): Don't attach handlers to focus-in-event or
focus-out-event signals. Handle notify signal.
2004-03-11 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetLabel): New native method declaration.
(setLabel): Use gtkSetLabel.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel): New method.
2004-03-10 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Default to
black when color argument is null.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: Remove check
for drag events.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild):
Remove candidate clip. Use the component
clip to intersect.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Use the PaintEvent's clip.
2004-03-10 Kim Ho <kho@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Don't set the clip for the
Graphics object.
2004-03-09 Graydon Hoare <graydon@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c:
Fix double <-> fixed macros, reset font transform.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:
Likewise.
2004-03-09�� Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild): Move
the x and y coordinate of the component rectangle
to correct position.
(handleEvent): Forward drag events to the pressed
component.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Fix comments.
(ArrowButtonListener::mousePressed): Stop the
existing timer.
(mouseDragged): Implement.
(TrackListener::mousePressed): Only react if
the press doesn't occur on the thumb, otherwise
just set the offset.
(TrackListener::mouseReleased): Unset the isAdjusting
value.
(createIncreaseIcon): Switch icon.
(createDecreaseIcon): Switch icon.
(calculatePreferredSize): Use width.
(getThumbBounds): Use the top as the lower value.
(layoutVScrollBar): Switch the button locations.
(paintIncreaseHighlight): Paint correct side of thumb.
(paintDecreaseHighlight): ditto.
(valueForYPosition): Use top as the lower value.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix comments.
(mouseDragged): Implement.
(mousePressed): Only react when the thumb isn't
pressed, otherwise just set offset.
(mouseReleased): Handle a release of the thumb.
(scrollDueToClickInTrack): Stop the timer first.
* javax/swing/JProgressBar.java:
(setString): Fix change condition.
* javax/swing/JSeparator.java:
Remove println's.
2004-03-08 David Jee <djee@redhat.com>
* java/awt/image/AffineTransformOp.java:
(filter): Use Graphics2D interface instead of directly using the
GdkGraphics2D peer.
2004-03-05 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkButtonPeer.java
(handleEvent): Action events are generated upon MOUSE_RELEASED.
* java/awt/Container.java
(acquireComponentForMouseEvent): Fixed.
(handleEvent): Fixed.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(state_to_awt_mods_with_button_states): New method.
(pre_event_handler): Fixed mouse event generation.
2004-03-05 Olga Rodimina <rodimina@redhat.com>
gnu/java/awt/peer/gtk/GdkGraphics2D.java
(GdkGraphics2D (BufferedImage)): Initialize
pixmap associated with specified BufferedImage.
(setPaint): Changed implementation of Texture
Paint to use AffineTransformOp.
* java/awt/image/AffineTransformOp.java
(createCompatibleDestRaster): Throw RasterFormatException
if resulting width or height of raster is 0.
2004-03-04 Olga Rodimina <rodimina@redhat.com>
* java/awt/image/AffineTransformOp.java:
Removed unnecessary field interpolationType.
Formatted some of the lines to be consistent with
the GNU style.
(AffineTransformOp): Create new RenderingHints
containing specified interpolation type.
(createCompatibleDestImage): Implemented.
(createCompatibleDestRaster): Implemented.
(filter): Implemented.
(getBounds2D(BufferedImage)): Implemented.
(getBounds2D(Raster)): Implemented.
(getInterpolationType): Get interpolation value from
rendering hints.
2004-03-04 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): Check if child peers are null.
2004-03-04 Graydon Hoare <graydon@redhat.com>
* testsuite/lib/libjava.exp (libjava_find_lib): Don't include
.libs in -L option.
(libjava_arguments): Add new libraries to argument list.
2004-03-04 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (toolexeclib_LTLIBRARIES): Added lib-java-awt.la,
lib-javax-swing.la, lib-java-applet.la, lib-java-beans.la.
(misc_java_source_files): New macro.
(swing_java_source_files): Likewise.
(awt_java_source_files): Pruned.
(applet_java_source_files): New macro.
(beans_java_source_files): Likewise.
(lib_java_applet_la_SOURCES): Likewise.
(lib_java_awt_la_SOURCES): Likewise.
(lib_javax_swing_la_SOURCES): Likewise.
(lib_java_beans_la_SOURCES): Likewise.
(all_java_object_files): Likewise.
(%.lo: %.java): Use all_java_object_files.
(all_java_source_files): Added new _SOURCES.
(ordinary_java_source_files): Removed awt_java_source_files.
2004-03-02 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added java/awt/image/AffineTransformOp.java
* Makefile.in: Re-generated.
* java/awt/image/AffineTransformOp.java: New Class.
2004-03-01 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(setPaint): Interpret correctly TexturePaint's
anchor rectangle.
(drawImage): Fixed scale factors of the affine
transform.
2004-02-27 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java
(GdkGraphics(Component)): Inherit font from component.
(drawString): Use font style.
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetFont): New native method declaration.
(setFont): New method.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(gtkSetFont): New native method declaration.
(setFont): Call new native method gtkSetFont.
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): For all child components who do not their fonts set,
set their peers' fonts with this container's font.
* gnu/java/awt/peer/gtk/GtkLabelPeer.java:
Move all native method declarations to the top for readability.
(gtkSetFont): New native method declaration.
(setFont): New method.
* java/awt/Component.java
(setFont): Invalidate after setting the font.
* java/awt/Container.java
(invalidateTree): New method.
(setFont): Invalidate the container tree after setting the font.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString): Use font style.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
(Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont): New method.
2004-02-27 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(updateBufferedImage): New helper function.
Updates BufferedImage in memory if it was changed.
(draw): changed to update BufferedImage in memory after
this drawing operation
(fill): Ditto.
(draw3DRect): Ditto.
(fill3DRect): Ditto.
(clearRect): Ditto.
(drawRaster): Ditto.
(drawImage) : Ditto. Update only in case of GtkOffScreenImage with
no affine transformation.
(drawGlyphVector): Ditto.
2004-02-26 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(isBufferedImageGraphics): New Helper function.
Returns true if this graphics2d can be used to draw
into buffered image and false otherwise.
(updateImagePixels): New Helper function.
Updates pixels in the BufferedImage.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
(getImagePixels): New function. Returns pixels
of the buffered image associated with
this Graphics2D.
2004-02-26 David Jee <djee@redhat.com>
* java/awt/BorderLayout.java
(layoutContainer): Fix width and height calculations to ensure
that they're non-negative.
* java/awt/Component.java
(setBackground): If c is null, inherit from closest ancestor whose
background color is set.
2004-02-26�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Add new files.
* Makefile.in: Re-generate.
* javax/swing/JProgressBar.java:
(JProgressBar(int, int int)): Throw
IllegalArgumentException if orientation is
invalid.
(JProgressBar(BoundedRangeModel)): Create
ChangeListener and register it. UpdateUI.
(getChangeListeners): Implement.
(setModel): Reset ChangeListener.
* javax/swing/JScrollBar.java: Implement.
* javax/swing/JSeparator.java: Implement.
* javax/swing/JSlider.java:
(JSlider(int, int, int, int)): Throw
IllegalArgumentException if orientation
is invalid.
(getChangeListeners): Fix method name.
* javax/swing/SwingUtilities.java:
(layoutCompoundLabel): If there is no text,
set the text rectangle dimensions to 0.
* javax/swing/plaf/basic/BasicButtonUI.java:
(paint): If there is no text, don't paint it.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Implement.
* javax/swing/plaf/basic/BasicSeparatorUI.java:
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java:
(propertyChange): If the model changes, change
the listeners accordingly.
2004-02-25 Graydon Hoare <graydon@redhat.com>
* javax/swing/AbstractButton.java: Add "final" qualifiers.
* javax/swing/JList.java: Reimplement.
* javax/swing/DefaultListSelectionModel.java: Reimplement.
* javax/swing/plaf/basic/BasicListUI.java: Reimplement.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add "purple" values.
* javax/swing/ListModel.java: Javadoc.
* javax/swing/ListSelectionModel.java: Add missing methods.
* javax/swing/AbstractListModel.java: Javadoc and corrections.
* javax/swing/DefaultListModel.java: Javadoc and corrections.
* javax/swing/ListModel.java: Javadoc and corrections.
* javax/swing/DefaultListCellRenderer.java: Minor tidying.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer): Change default size to 12.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer): Change default size to 12.
(getClasspathFontPeer): Likewise. Set default name to "Default".
* java/awt/Font.java
(Font(Map)): Call Font(String,Map).
(Font(String,Map)): If attrs is null, initialize it as an empty
HashMap, which will ensure that the Font will get default attributes.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer(String,int)): Call the new constructor with size 1.
(GtkFontPeer(String,int,int)): New constructor with size attribute.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer(String,int)): Call the new overload method with size 1.
(getFontPeer(String,int,int)): New method. Overloaded with size
attribute.
(getClasspathFontPeer): Set the size of the font.
2004-02-24 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(bimage): New field.
(GdkGraphics2D): New Constructor. Constructs Graphics
object that can be used to draw into the Buffered Image.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
(GdkGraphicsEnvironment): Fixed to include public
keyword.
(createGraphics): Implemented.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getLocalGraphicsEnvironment): Implemented.
* java/awt/GraphicsEnvironment.java:
(getLocalGraphicsEnvironment): Implemented.
* java/awt/image/BufferedImage.java:
(createGraphics): Implemented.
2004-02-24 David Jee <djee@redhat.com>
* java/awt/Component.java
(eventTypeEnabled): Add MOUSE_MOVED and MOUSE_DRAGGED event types.
* java/awt/Container.java
(addNotifyContainerChildren): Fix event enabling.
2004-02-23 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added
gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
* Makefile.in: Re-generated.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
New Class.
2004-02-19 Kim Ho <kho@redhat.com>
* Makefile.am: Add BasicProgressBarUI
* Makefile.in: Regenerate.
* javax/swing/JProgressBar.java:
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java
Add constants for JProgressBar.
* javax/swing/plaf/basic/BasicProgressBarUI.java
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java
Change comments.
(calculateGeometry): New method
(paint): Remove unnecessary size calculations.
2004-02-18 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(drawRaster): Fixed small error that caused
imageToUser transformation to be set incorrectly.
(toString): Implemented.
2004-02-18 David Jee <djee@redhat.com>
* java/awt/CardLayout.java
(addLayoutComponent): Show the first component added as the default.
(removeLayoutComponent): After removing, show the next component.
(gotoComponent): If there is only one component, show it and return.
2004-02-18 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Re-order
modifiers.
* javax/swing/JLabel.java: Re-order
modifiers.
* javax/swing/JComponent.java:
(addPropertyChangeListener):
Implement.
(removePropertyChangeListener):
ditto.
(firePropertyChangeEvent):
ditto.
2004-02-17 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch ComponentEvent via system event queue.
(hide): Likewise.
(move): Likewise.
(resize): Likewise.
(reshape): Likewise.
* java/awt/Window.java
(setBoundsCallback): Likewise.
2004-02-17 David Jee <djee@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds):
Use gtk_widget_set_size_request() instead of the deprecated
gtk_widget_set_usize().
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Fix comments and
make property strings constants.
(createStandardLabels): Use the labels
preferred size as bounds.
* javax/swing/plaf/basic/BasicSliderUI.java
Fix comments.
(ScrollHandler::actionPerformed): Don't
calculate the timer stop value. Let the
MouseListeners find the stop location.
(getPreferredHorizontalSize): Re-implement.
(getPreferredVerticalSize): ditto.
(getMinimumHorizontalSize): ditto.
(getMinimumVerticalSize): ditto.
(getPreferredSize): ditto.
(getMinimumSize): ditto.
(getMaximumSize): ditto.
(paintTicks): Use doubles to find the
tick location.
(paintHorizontalLabel):�� Use preferredSize
as initial width and height.
(paintVerticalLabel): ditto.
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Changed
property strings to constants.
(DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY):
New property.
(setText): Change mnemonic index if
text is too short.
(setDisplayedMnemonicIndex): Fire property
change event.
(getDisplayedMnemonicIndex): Remove check
against short text.
2004-02-17 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(drawImage(img,xform,obs)): Invert xform before
passing the xform to cairo.
(drawImage(img,x,y,bgcolor,obs)): Implemented.
(drawImage (img,x,y,w,h,bgcolor,obs)): Partly
implemented.
(drawImage (img,x,y,w,h,obs)): Implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,
bgcolor,obs)): Partly implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,obs)):
Implemented.
* java/awt/image/BufferedImage.java:
(copyData): if dest is null, create raster with same
dimensions as the current image.
2004-02-16 Graydon Hoare <graydon@redhat.com>
* javax/swing/plaf/basic/BasicLabelUI.java
(getPreferredSize): Use layoutCL.
* javax/swing/plaf/basic/BasicGraphicsUtils.java
(getPreferredButtonSize): Start with empty view rect, layout using
component's preferred alignment.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add some Label and
List defaults.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch COMPONENT_SHOWN ComponentEvent.
(hide): Dispatch COMPONENT_HIDDEN ComponentEvent.
(move): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_MOVED ComponentEvent.
(resize): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_RESIZED ComponentEvent.
(reshape): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
* java/awt/Window.java
(setBoundsCallback): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
2004-02-16 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(setRenderingHint): Added implementation of
Interpolation rendering hints.
(setRenderingHints): Ditto.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
(drawPixels): fixed to allow user to choose type
of filtering that should be used when displaying images.
(cairoSurfaceSetFilter): New method. Sets filter type for
interpolation of pixel values.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(calcCellSizes): Rows or columns with zero sizes should still be
considered for extra space distribution.
2004-02-16 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Re-implement.
* javax/swing/plaf/basic/BasicLabelUI.java
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Added constant.
2004-02-16�� Kim Ho�� <kho@redhat.com>
* javax/swing/JSlider.java: Fix indentation and comments.
(setModel): Remove null check to conform with Sun's.
(setOrientation): Throw exception if not
HORIZONTAL or VERTICAL.
(getInverted): Use private variable instead of
ComponentOrientation.
(setInverted): ditto.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix indentation and comments.
(propertyChange): Remove check for inverted slider, handle
in main paint.
(getMinimumSize): Return preferred size.
(getMaximumSize): ditto.
(calculateFocusRect): Don't relocate rectangle.
(drawInverted): Return XOR of the slider's inversion and
the component's orientation.
(paint): Update leftToRightCache
2004-02-13 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(GetLayoutInfo): Fix weight and size distribution. Relocate repeated
code to helper methods.
(sortBySpan): New helper method.
(distributeSizeAndWeight): Likewise.
(calcCellWeights): Likewise.
(calcCellSizes): Add comments.
2004-02-13 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Only do something if component is invisible at the moment.
(hide): Only do something if component is visible at the moment.
(reshape): If lightweight, erase old bounds and repaint new bounds.
2004-02-13�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Updated for new file.
* Makefile.in: Regenerated.
* javax/swing/JSlider.java: Reimplement.
* javax/swing/SwingUtilities.java
(layoutCompoundLabel): Use icon height
instead of width.
(paintComponent): Implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Add JSlider defaults.
* javax/swing/plaf/basic/BasicSliderUI.java:
Implement. New file.
From-SVN: r79607
2004-03-17 21:29:02 +00:00
|
|
|
{
|
|
|
|
// If attrs is null, setting it to an empty HashMap will give this
|
|
|
|
// Font default attributes.
|
|
|
|
if (attrs == null)
|
|
|
|
attrs = new HashMap();
|
2003-12-31 08:58:31 +00:00
|
|
|
this.peer = getPeerFromToolkit (name, attrs);
|
[multiple changes]
2004-03-12 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Clipping fixes.
* javax/swing/JComponent.java (paint): Use persistent double buffer.
* javax/swing/JList.java (ListListener): Revalidate on changes.
* javax/swing/JScrollPane.java: Reimplement.
* javax/swing/JViewport.java: Reimplement.
* javax/swing/ScrollPaneLayout.java: Reimplement.
* javax/swing/ViewportLayout.java: Tidy up.
* javax/swing/plaf/basic/BasicButtonListener.java: Remove printlns.
* javax/swing/plaf/basic/BasicScrollPaneUI.java: Reimplement.
* javax/swing/plaf/basic/BasicSliderUI.java: Handle missing labels.
* javax/swing/plaf/basic/BasicViewportUI.java: Implement in terms of
backing store only.
2004-03-11 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(window_wm_protocols_filter): New function.
(window_focus_in_cb): Remove function.
(window_focus_out_cb): Likewise.
(window_focus_or_active_state_change_cb): New function.
(create): Add filter that removes WM_TAKE_FOCUS client messages.
(connectSignals): Don't attach handlers to focus-in-event or
focus-out-event signals. Handle notify signal.
2004-03-11 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetLabel): New native method declaration.
(setLabel): Use gtkSetLabel.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel): New method.
2004-03-10 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Default to
black when color argument is null.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: Remove check
for drag events.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild):
Remove candidate clip. Use the component
clip to intersect.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Use the PaintEvent's clip.
2004-03-10 Kim Ho <kho@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Don't set the clip for the
Graphics object.
2004-03-09 Graydon Hoare <graydon@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c:
Fix double <-> fixed macros, reset font transform.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:
Likewise.
2004-03-09�� Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild): Move
the x and y coordinate of the component rectangle
to correct position.
(handleEvent): Forward drag events to the pressed
component.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Fix comments.
(ArrowButtonListener::mousePressed): Stop the
existing timer.
(mouseDragged): Implement.
(TrackListener::mousePressed): Only react if
the press doesn't occur on the thumb, otherwise
just set the offset.
(TrackListener::mouseReleased): Unset the isAdjusting
value.
(createIncreaseIcon): Switch icon.
(createDecreaseIcon): Switch icon.
(calculatePreferredSize): Use width.
(getThumbBounds): Use the top as the lower value.
(layoutVScrollBar): Switch the button locations.
(paintIncreaseHighlight): Paint correct side of thumb.
(paintDecreaseHighlight): ditto.
(valueForYPosition): Use top as the lower value.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix comments.
(mouseDragged): Implement.
(mousePressed): Only react when the thumb isn't
pressed, otherwise just set offset.
(mouseReleased): Handle a release of the thumb.
(scrollDueToClickInTrack): Stop the timer first.
* javax/swing/JProgressBar.java:
(setString): Fix change condition.
* javax/swing/JSeparator.java:
Remove println's.
2004-03-08 David Jee <djee@redhat.com>
* java/awt/image/AffineTransformOp.java:
(filter): Use Graphics2D interface instead of directly using the
GdkGraphics2D peer.
2004-03-05 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkButtonPeer.java
(handleEvent): Action events are generated upon MOUSE_RELEASED.
* java/awt/Container.java
(acquireComponentForMouseEvent): Fixed.
(handleEvent): Fixed.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(state_to_awt_mods_with_button_states): New method.
(pre_event_handler): Fixed mouse event generation.
2004-03-05 Olga Rodimina <rodimina@redhat.com>
gnu/java/awt/peer/gtk/GdkGraphics2D.java
(GdkGraphics2D (BufferedImage)): Initialize
pixmap associated with specified BufferedImage.
(setPaint): Changed implementation of Texture
Paint to use AffineTransformOp.
* java/awt/image/AffineTransformOp.java
(createCompatibleDestRaster): Throw RasterFormatException
if resulting width or height of raster is 0.
2004-03-04 Olga Rodimina <rodimina@redhat.com>
* java/awt/image/AffineTransformOp.java:
Removed unnecessary field interpolationType.
Formatted some of the lines to be consistent with
the GNU style.
(AffineTransformOp): Create new RenderingHints
containing specified interpolation type.
(createCompatibleDestImage): Implemented.
(createCompatibleDestRaster): Implemented.
(filter): Implemented.
(getBounds2D(BufferedImage)): Implemented.
(getBounds2D(Raster)): Implemented.
(getInterpolationType): Get interpolation value from
rendering hints.
2004-03-04 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): Check if child peers are null.
2004-03-04 Graydon Hoare <graydon@redhat.com>
* testsuite/lib/libjava.exp (libjava_find_lib): Don't include
.libs in -L option.
(libjava_arguments): Add new libraries to argument list.
2004-03-04 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (toolexeclib_LTLIBRARIES): Added lib-java-awt.la,
lib-javax-swing.la, lib-java-applet.la, lib-java-beans.la.
(misc_java_source_files): New macro.
(swing_java_source_files): Likewise.
(awt_java_source_files): Pruned.
(applet_java_source_files): New macro.
(beans_java_source_files): Likewise.
(lib_java_applet_la_SOURCES): Likewise.
(lib_java_awt_la_SOURCES): Likewise.
(lib_javax_swing_la_SOURCES): Likewise.
(lib_java_beans_la_SOURCES): Likewise.
(all_java_object_files): Likewise.
(%.lo: %.java): Use all_java_object_files.
(all_java_source_files): Added new _SOURCES.
(ordinary_java_source_files): Removed awt_java_source_files.
2004-03-02 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added java/awt/image/AffineTransformOp.java
* Makefile.in: Re-generated.
* java/awt/image/AffineTransformOp.java: New Class.
2004-03-01 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(setPaint): Interpret correctly TexturePaint's
anchor rectangle.
(drawImage): Fixed scale factors of the affine
transform.
2004-02-27 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java
(GdkGraphics(Component)): Inherit font from component.
(drawString): Use font style.
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetFont): New native method declaration.
(setFont): New method.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(gtkSetFont): New native method declaration.
(setFont): Call new native method gtkSetFont.
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): For all child components who do not their fonts set,
set their peers' fonts with this container's font.
* gnu/java/awt/peer/gtk/GtkLabelPeer.java:
Move all native method declarations to the top for readability.
(gtkSetFont): New native method declaration.
(setFont): New method.
* java/awt/Component.java
(setFont): Invalidate after setting the font.
* java/awt/Container.java
(invalidateTree): New method.
(setFont): Invalidate the container tree after setting the font.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString): Use font style.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
(Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont): New method.
2004-02-27 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(updateBufferedImage): New helper function.
Updates BufferedImage in memory if it was changed.
(draw): changed to update BufferedImage in memory after
this drawing operation
(fill): Ditto.
(draw3DRect): Ditto.
(fill3DRect): Ditto.
(clearRect): Ditto.
(drawRaster): Ditto.
(drawImage) : Ditto. Update only in case of GtkOffScreenImage with
no affine transformation.
(drawGlyphVector): Ditto.
2004-02-26 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(isBufferedImageGraphics): New Helper function.
Returns true if this graphics2d can be used to draw
into buffered image and false otherwise.
(updateImagePixels): New Helper function.
Updates pixels in the BufferedImage.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
(getImagePixels): New function. Returns pixels
of the buffered image associated with
this Graphics2D.
2004-02-26 David Jee <djee@redhat.com>
* java/awt/BorderLayout.java
(layoutContainer): Fix width and height calculations to ensure
that they're non-negative.
* java/awt/Component.java
(setBackground): If c is null, inherit from closest ancestor whose
background color is set.
2004-02-26�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Add new files.
* Makefile.in: Re-generate.
* javax/swing/JProgressBar.java:
(JProgressBar(int, int int)): Throw
IllegalArgumentException if orientation is
invalid.
(JProgressBar(BoundedRangeModel)): Create
ChangeListener and register it. UpdateUI.
(getChangeListeners): Implement.
(setModel): Reset ChangeListener.
* javax/swing/JScrollBar.java: Implement.
* javax/swing/JSeparator.java: Implement.
* javax/swing/JSlider.java:
(JSlider(int, int, int, int)): Throw
IllegalArgumentException if orientation
is invalid.
(getChangeListeners): Fix method name.
* javax/swing/SwingUtilities.java:
(layoutCompoundLabel): If there is no text,
set the text rectangle dimensions to 0.
* javax/swing/plaf/basic/BasicButtonUI.java:
(paint): If there is no text, don't paint it.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Implement.
* javax/swing/plaf/basic/BasicSeparatorUI.java:
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java:
(propertyChange): If the model changes, change
the listeners accordingly.
2004-02-25 Graydon Hoare <graydon@redhat.com>
* javax/swing/AbstractButton.java: Add "final" qualifiers.
* javax/swing/JList.java: Reimplement.
* javax/swing/DefaultListSelectionModel.java: Reimplement.
* javax/swing/plaf/basic/BasicListUI.java: Reimplement.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add "purple" values.
* javax/swing/ListModel.java: Javadoc.
* javax/swing/ListSelectionModel.java: Add missing methods.
* javax/swing/AbstractListModel.java: Javadoc and corrections.
* javax/swing/DefaultListModel.java: Javadoc and corrections.
* javax/swing/ListModel.java: Javadoc and corrections.
* javax/swing/DefaultListCellRenderer.java: Minor tidying.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer): Change default size to 12.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer): Change default size to 12.
(getClasspathFontPeer): Likewise. Set default name to "Default".
* java/awt/Font.java
(Font(Map)): Call Font(String,Map).
(Font(String,Map)): If attrs is null, initialize it as an empty
HashMap, which will ensure that the Font will get default attributes.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer(String,int)): Call the new constructor with size 1.
(GtkFontPeer(String,int,int)): New constructor with size attribute.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer(String,int)): Call the new overload method with size 1.
(getFontPeer(String,int,int)): New method. Overloaded with size
attribute.
(getClasspathFontPeer): Set the size of the font.
2004-02-24 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(bimage): New field.
(GdkGraphics2D): New Constructor. Constructs Graphics
object that can be used to draw into the Buffered Image.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
(GdkGraphicsEnvironment): Fixed to include public
keyword.
(createGraphics): Implemented.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getLocalGraphicsEnvironment): Implemented.
* java/awt/GraphicsEnvironment.java:
(getLocalGraphicsEnvironment): Implemented.
* java/awt/image/BufferedImage.java:
(createGraphics): Implemented.
2004-02-24 David Jee <djee@redhat.com>
* java/awt/Component.java
(eventTypeEnabled): Add MOUSE_MOVED and MOUSE_DRAGGED event types.
* java/awt/Container.java
(addNotifyContainerChildren): Fix event enabling.
2004-02-23 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added
gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
* Makefile.in: Re-generated.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
New Class.
2004-02-19 Kim Ho <kho@redhat.com>
* Makefile.am: Add BasicProgressBarUI
* Makefile.in: Regenerate.
* javax/swing/JProgressBar.java:
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java
Add constants for JProgressBar.
* javax/swing/plaf/basic/BasicProgressBarUI.java
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java
Change comments.
(calculateGeometry): New method
(paint): Remove unnecessary size calculations.
2004-02-18 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(drawRaster): Fixed small error that caused
imageToUser transformation to be set incorrectly.
(toString): Implemented.
2004-02-18 David Jee <djee@redhat.com>
* java/awt/CardLayout.java
(addLayoutComponent): Show the first component added as the default.
(removeLayoutComponent): After removing, show the next component.
(gotoComponent): If there is only one component, show it and return.
2004-02-18 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Re-order
modifiers.
* javax/swing/JLabel.java: Re-order
modifiers.
* javax/swing/JComponent.java:
(addPropertyChangeListener):
Implement.
(removePropertyChangeListener):
ditto.
(firePropertyChangeEvent):
ditto.
2004-02-17 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch ComponentEvent via system event queue.
(hide): Likewise.
(move): Likewise.
(resize): Likewise.
(reshape): Likewise.
* java/awt/Window.java
(setBoundsCallback): Likewise.
2004-02-17 David Jee <djee@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds):
Use gtk_widget_set_size_request() instead of the deprecated
gtk_widget_set_usize().
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Fix comments and
make property strings constants.
(createStandardLabels): Use the labels
preferred size as bounds.
* javax/swing/plaf/basic/BasicSliderUI.java
Fix comments.
(ScrollHandler::actionPerformed): Don't
calculate the timer stop value. Let the
MouseListeners find the stop location.
(getPreferredHorizontalSize): Re-implement.
(getPreferredVerticalSize): ditto.
(getMinimumHorizontalSize): ditto.
(getMinimumVerticalSize): ditto.
(getPreferredSize): ditto.
(getMinimumSize): ditto.
(getMaximumSize): ditto.
(paintTicks): Use doubles to find the
tick location.
(paintHorizontalLabel):�� Use preferredSize
as initial width and height.
(paintVerticalLabel): ditto.
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Changed
property strings to constants.
(DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY):
New property.
(setText): Change mnemonic index if
text is too short.
(setDisplayedMnemonicIndex): Fire property
change event.
(getDisplayedMnemonicIndex): Remove check
against short text.
2004-02-17 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(drawImage(img,xform,obs)): Invert xform before
passing the xform to cairo.
(drawImage(img,x,y,bgcolor,obs)): Implemented.
(drawImage (img,x,y,w,h,bgcolor,obs)): Partly
implemented.
(drawImage (img,x,y,w,h,obs)): Implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,
bgcolor,obs)): Partly implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,obs)):
Implemented.
* java/awt/image/BufferedImage.java:
(copyData): if dest is null, create raster with same
dimensions as the current image.
2004-02-16 Graydon Hoare <graydon@redhat.com>
* javax/swing/plaf/basic/BasicLabelUI.java
(getPreferredSize): Use layoutCL.
* javax/swing/plaf/basic/BasicGraphicsUtils.java
(getPreferredButtonSize): Start with empty view rect, layout using
component's preferred alignment.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add some Label and
List defaults.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch COMPONENT_SHOWN ComponentEvent.
(hide): Dispatch COMPONENT_HIDDEN ComponentEvent.
(move): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_MOVED ComponentEvent.
(resize): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_RESIZED ComponentEvent.
(reshape): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
* java/awt/Window.java
(setBoundsCallback): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
2004-02-16 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(setRenderingHint): Added implementation of
Interpolation rendering hints.
(setRenderingHints): Ditto.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
(drawPixels): fixed to allow user to choose type
of filtering that should be used when displaying images.
(cairoSurfaceSetFilter): New method. Sets filter type for
interpolation of pixel values.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(calcCellSizes): Rows or columns with zero sizes should still be
considered for extra space distribution.
2004-02-16 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Re-implement.
* javax/swing/plaf/basic/BasicLabelUI.java
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Added constant.
2004-02-16�� Kim Ho�� <kho@redhat.com>
* javax/swing/JSlider.java: Fix indentation and comments.
(setModel): Remove null check to conform with Sun's.
(setOrientation): Throw exception if not
HORIZONTAL or VERTICAL.
(getInverted): Use private variable instead of
ComponentOrientation.
(setInverted): ditto.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix indentation and comments.
(propertyChange): Remove check for inverted slider, handle
in main paint.
(getMinimumSize): Return preferred size.
(getMaximumSize): ditto.
(calculateFocusRect): Don't relocate rectangle.
(drawInverted): Return XOR of the slider's inversion and
the component's orientation.
(paint): Update leftToRightCache
2004-02-13 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(GetLayoutInfo): Fix weight and size distribution. Relocate repeated
code to helper methods.
(sortBySpan): New helper method.
(distributeSizeAndWeight): Likewise.
(calcCellWeights): Likewise.
(calcCellSizes): Add comments.
2004-02-13 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Only do something if component is invisible at the moment.
(hide): Only do something if component is visible at the moment.
(reshape): If lightweight, erase old bounds and repaint new bounds.
2004-02-13�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Updated for new file.
* Makefile.in: Regenerated.
* javax/swing/JSlider.java: Reimplement.
* javax/swing/SwingUtilities.java
(layoutCompoundLabel): Use icon height
instead of width.
(paintComponent): Implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Add JSlider defaults.
* javax/swing/plaf/basic/BasicSliderUI.java:
Implement. New file.
From-SVN: r79607
2004-03-17 21:29:02 +00:00
|
|
|
}
|
2003-08-13 16:49:58 +00:00
|
|
|
|
2002-01-22 22:03:04 +00:00
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Instance Methods
|
2000-03-17 00:45:06 +00:00
|
|
|
*/
|
1999-05-05 04:05:57 -07:00
|
|
|
|
2002-01-22 22:03:04 +00:00
|
|
|
/**
|
2003-12-31 08:58:31 +00:00
|
|
|
* Returns the logical name of the font. A logical name is the name the
|
|
|
|
* font was constructed with. It may be the name of a logical font (one
|
|
|
|
* of 6 required names in all java environments) or it may be a face
|
|
|
|
* name.
|
2002-01-22 22:03:04 +00:00
|
|
|
*
|
2003-08-13 16:49:58 +00:00
|
|
|
* @return The logical name of the font.
|
|
|
|
*
|
|
|
|
* @see getFamily()
|
|
|
|
* @see getFontName()
|
2002-01-22 22:03:04 +00:00
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public String getName ()
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getName (this);
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the style of the font.
|
|
|
|
*
|
|
|
|
* @return The font style.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public int getSize ()
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return (int) peer.getSize (this);
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
2003-12-31 08:58:31 +00:00
|
|
|
public float getSize2D ()
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getSize (this);
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests whether or not this is a plain font. This will be true if
|
|
|
|
* and only if neither the bold nor the italics style is set.
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if this is a plain font, <code>false</code>
|
|
|
|
* otherwise.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public boolean isPlain ()
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.isPlain (this);
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests whether or not this font is bold.
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if this font is bold, <code>false</code>
|
|
|
|
* otherwise.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public boolean isBold ()
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.isBold (this);
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests whether or not this font is italic.
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if this font is italic, <code>false</code>
|
|
|
|
* otherwise.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public boolean isItalic ()
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.isItalic (this);
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
2003-12-31 08:58:31 +00:00
|
|
|
* Returns the family name of this font. A family name describes a design
|
|
|
|
* or "brand name" (such as Helvetica or Palatino). It is less specific
|
|
|
|
* than a font face name (such as Helvetica Bold).
|
2003-08-13 16:49:58 +00:00
|
|
|
*
|
|
|
|
* @return A string containing the font family name.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
2002-01-22 22:03:04 +00:00
|
|
|
*
|
2003-08-13 16:49:58 +00:00
|
|
|
* @see getName()
|
|
|
|
* @see getFontName()
|
|
|
|
* @see GraphicsEnvironment.getAvailableFontFamilyNames()
|
2002-01-22 22:03:04 +00:00
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public String getFamily ()
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getFamily (this);
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
2003-08-13 16:49:58 +00:00
|
|
|
/**
|
|
|
|
* Returns integer code representing the sum of style flags of this font, a
|
|
|
|
* combination of either {@link PLAIN}, {@link BOLD}, or {@link ITALIC}.
|
|
|
|
*
|
|
|
|
* @return code representing the style of this font.
|
|
|
|
*
|
|
|
|
* @see isPlain()
|
|
|
|
* @see isBold()
|
|
|
|
* @see isItalic()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public int getStyle ()
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getStyle (this);
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
2003-08-13 16:49:58 +00:00
|
|
|
/**
|
|
|
|
* Checks if specified character maps to a glyph in this font.
|
|
|
|
*
|
|
|
|
* @param c The character to check.
|
|
|
|
*
|
|
|
|
* @return Whether the character has a corresponding glyph in this font.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public boolean canDisplay (char c)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.canDisplay (this, c);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Checks how much of a given string can be mapped to glyphs in
|
|
|
|
* this font.
|
|
|
|
*
|
|
|
|
* @param s The string to check.
|
|
|
|
*
|
|
|
|
* @return The index of the first character in <code>s</code> which cannot
|
|
|
|
* be converted to a glyph by this font, or <code>-1</code> if all
|
|
|
|
* characters can be mapped to glyphs.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public int canDisplayUpTo (String s)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.canDisplayUpTo (this, new StringCharacterIterator (s),
|
|
|
|
0, s.length () - 1);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Checks how much of a given sequence of text can be mapped to glyphs in
|
|
|
|
* this font.
|
|
|
|
*
|
|
|
|
* @param text Array containing the text to check.
|
|
|
|
* @param start Position of first character to check in <code>text</code>.
|
|
|
|
* @param limit Position of last character to check in <code>text</code>.
|
|
|
|
*
|
|
|
|
* @return The index of the first character in the indicated range which
|
|
|
|
* cannot be converted to a glyph by this font, or <code>-1</code> if all
|
|
|
|
* characters can be mapped to glyphs.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if the range [start, limit] is
|
|
|
|
* invalid in <code>text</code>.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public int canDisplayUpTo (char[] text, int start, int limit)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.canDisplayUpTo
|
|
|
|
(this, new StringCharacterIterator (new String (text)), start, limit);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Checks how much of a given sequence of text can be mapped to glyphs in
|
|
|
|
* this font.
|
|
|
|
*
|
|
|
|
* @param i Iterator over the text to check.
|
|
|
|
* @param start Position of first character to check in <code>i</code>.
|
|
|
|
* @param limit Position of last character to check in <code>i</code>.
|
|
|
|
*
|
|
|
|
* @return The index of the first character in the indicated range which
|
|
|
|
* cannot be converted to a glyph by this font, or <code>-1</code> if all
|
|
|
|
* characters can be mapped to glyphs.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if the range [start, limit] is
|
|
|
|
* invalid in <code>i</code>.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public int canDisplayUpTo (CharacterIterator i, int start, int limit)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.canDisplayUpTo (this, i, start, limit);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Creates a new font with point size 1 and {@link PLAIN} style,
|
|
|
|
* reading font data from the provided input stream. The resulting font
|
|
|
|
* can have further fonts derived from it using its
|
|
|
|
* <code>deriveFont</code> method.
|
|
|
|
*
|
|
|
|
* @param fontFormat Integer code indicating the format the font data is
|
|
|
|
* in.Currently this can only be {@link TRUETYPE_FONT}.
|
|
|
|
* @param is {@link InputStream} from which font data will be read. This
|
|
|
|
* stream is not closed after font data is extracted.
|
|
|
|
*
|
|
|
|
* @return A new {@link Font} of the format indicated.
|
|
|
|
*
|
|
|
|
* @throws IllegalArgumentException if <code>fontType</code> is not
|
|
|
|
* recognized.
|
|
|
|
* @throws FontFormatException if data in InputStream is not of format
|
|
|
|
* indicated.
|
|
|
|
* @throws IOException if insufficient data is present on InputStream.
|
|
|
|
*
|
|
|
|
* @since 1.3
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public static Font createFont (int fontFormat, InputStream is)
|
2003-08-13 16:49:58 +00:00
|
|
|
throws FontFormatException, IOException
|
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return tk().createFont (fontFormat, is);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Maps characters to glyphs in a one-to-one relationship, returning a new
|
|
|
|
* {@link GlyphVector} with a mapped glyph for each input character. This
|
|
|
|
* sort of mapping is often sufficient for some scripts such as Roman, but
|
|
|
|
* is inappropriate for scripts with special shaping or contextual layout
|
|
|
|
* requirements such as Arabic, Indic, Hebrew or Thai.
|
|
|
|
*
|
|
|
|
* @param ctx The rendering context used for precise glyph placement.
|
|
|
|
* @param str The string to convert to Glyphs.
|
|
|
|
*
|
|
|
|
* @return A new {@link GlyphVector} containing glyphs mapped from str,
|
|
|
|
* through the font's cmap table.
|
|
|
|
*
|
|
|
|
* @see layoutGlyphVector()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public GlyphVector createGlyphVector (FontRenderContext ctx, String str)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.createGlyphVector (this, ctx, new StringCharacterIterator (str));
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Maps characters to glyphs in a one-to-one relationship, returning a new
|
|
|
|
* {@link GlyphVector} with a mapped glyph for each input character. This
|
|
|
|
* sort of mapping is often sufficient for some scripts such as Roman, but
|
|
|
|
* is inappropriate for scripts with special shaping or contextual layout
|
|
|
|
* requirements such as Arabic, Indic, Hebrew or Thai.
|
|
|
|
*
|
|
|
|
* @param ctx The rendering context used for precise glyph placement.
|
|
|
|
* @param i Iterator over the text to convert to glyphs.
|
|
|
|
*
|
|
|
|
* @return A new {@link GlyphVector} containing glyphs mapped from str,
|
|
|
|
* through the font's cmap table.
|
|
|
|
*
|
|
|
|
* @see layoutGlyphVector()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public GlyphVector createGlyphVector (FontRenderContext ctx, CharacterIterator i)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.createGlyphVector (this, ctx, i);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Maps characters to glyphs in a one-to-one relationship, returning a new
|
|
|
|
* {@link GlyphVector} with a mapped glyph for each input character. This
|
|
|
|
* sort of mapping is often sufficient for some scripts such as Roman, but
|
|
|
|
* is inappropriate for scripts with special shaping or contextual layout
|
|
|
|
* requirements such as Arabic, Indic, Hebrew or Thai.
|
|
|
|
*
|
|
|
|
* @param ctx The rendering context used for precise glyph placement.
|
|
|
|
* @param chars Array of characters to convert to glyphs.
|
|
|
|
*
|
|
|
|
* @return A new {@link GlyphVector} containing glyphs mapped from str,
|
|
|
|
* through the font's cmap table.
|
|
|
|
*
|
|
|
|
* @see layoutGlyphVector()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public GlyphVector createGlyphVector (FontRenderContext ctx, char[] chars)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.createGlyphVector
|
|
|
|
(this, ctx, new StringCharacterIterator (new String (chars)));
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Extracts a sequence of glyphs from a font, returning a new {@link
|
|
|
|
* GlyphVector} with a mapped glyph for each input glyph code.
|
|
|
|
*
|
|
|
|
* @param ctx The rendering context used for precise glyph placement.
|
|
|
|
* @param chars Array of characters to convert to glyphs.
|
|
|
|
*
|
|
|
|
* @return A new {@link GlyphVector} containing glyphs mapped from str,
|
|
|
|
* through the font's cmap table.
|
|
|
|
*
|
|
|
|
* @see layoutGlyphVector()
|
|
|
|
*
|
|
|
|
* @specnote This method is documented to perform character-to-glyph
|
|
|
|
* conversions, in the Sun documentation, but its second parameter name is
|
|
|
|
* "glyphCodes" and it is not clear to me why it would exist if its
|
|
|
|
* purpose was to transport character codes inside integers. I assume it
|
|
|
|
* is mis-documented in the Sun documentation.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
|
|
|
|
public GlyphVector createGlyphVector (FontRenderContext ctx, int[] glyphCodes)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.createGlyphVector (this, ctx, glyphCodes);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
2004-04-22 05:34:30 +00:00
|
|
|
/**
|
|
|
|
* Produces a new {@link Font} based on the current font, adjusted to a
|
|
|
|
* new size and style.
|
|
|
|
*
|
|
|
|
* @param style The style of the newly created font.
|
|
|
|
* @param size The size of the newly created font.
|
|
|
|
*
|
|
|
|
* @return A clone of the current font, with the specified size and style.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
|
|
|
public Font deriveFont (int style, float size)
|
|
|
|
{
|
|
|
|
return peer.deriveFont (this, style, size);
|
|
|
|
}
|
|
|
|
|
2003-08-13 16:49:58 +00:00
|
|
|
/**
|
|
|
|
* Produces a new {@link Font} based on the current font, adjusted to a
|
|
|
|
* new size.
|
|
|
|
*
|
|
|
|
* @param size The size of the newly created font.
|
|
|
|
*
|
|
|
|
* @return A clone of the current font, with the specified size.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public Font deriveFont (float size)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.deriveFont (this, size);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Produces a new {@link Font} based on the current font, adjusted to a
|
|
|
|
* new style.
|
|
|
|
*
|
|
|
|
* @param style The style of the newly created font.
|
|
|
|
*
|
|
|
|
* @return A clone of the current font, with the specified style.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public Font deriveFont (int style)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.deriveFont (this, style);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Produces a new {@link Font} based on the current font, adjusted to a
|
|
|
|
* new style and subjected to a new affine transformation.
|
|
|
|
*
|
|
|
|
* @param style The style of the newly created font.
|
|
|
|
* @param a The transformation to apply.
|
|
|
|
*
|
|
|
|
* @return A clone of the current font, with the specified style and
|
|
|
|
* transform.
|
|
|
|
*
|
|
|
|
* @throws IllegalArgumentException If transformation is
|
|
|
|
* <code>null</code>.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public Font deriveFont (int style, AffineTransform a)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
if (a == null)
|
|
|
|
throw new IllegalArgumentException ("Affine transformation is null");
|
|
|
|
|
|
|
|
return peer.deriveFont (this, style, a);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
2004-04-22 05:34:30 +00:00
|
|
|
/**
|
|
|
|
* Produces a new {@link Font} based on the current font, subjected
|
|
|
|
* to a new affine transformation.
|
|
|
|
*
|
|
|
|
* @param a The transformation to apply.
|
|
|
|
*
|
|
|
|
* @return A clone of the current font, with the specified transform.
|
|
|
|
*
|
|
|
|
* @throws IllegalArgumentException If transformation is
|
|
|
|
* <code>null</code>.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
|
|
|
public Font deriveFont (AffineTransform a)
|
|
|
|
{
|
|
|
|
if (a == null)
|
|
|
|
throw new IllegalArgumentException ("Affine transformation is null");
|
|
|
|
|
|
|
|
return peer.deriveFont (this, a);
|
|
|
|
}
|
|
|
|
|
2003-08-13 16:49:58 +00:00
|
|
|
/**
|
|
|
|
* Produces a new {@link Font} based on the current font, adjusted to a
|
|
|
|
* new set of attributes.
|
|
|
|
*
|
|
|
|
* @param attributes Attributes of the newly created font.
|
|
|
|
*
|
|
|
|
* @return A clone of the current font, with the specified attributes.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public Font deriveFont (Map attributes)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.deriveFont (this, attributes);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a map of chracter attributes which this font currently has set.
|
|
|
|
*
|
|
|
|
* @return A map of chracter attributes which this font currently has set.
|
|
|
|
*
|
|
|
|
* @see getAvailableAttributes()
|
|
|
|
* @see java.text.AttributedCharacterIterator.Attribute
|
|
|
|
* @see java.awt.font.TextAttribute
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public Map getAttributes ()
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getAttributes (this);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns an array of chracter attribute keys which this font understands.
|
|
|
|
*
|
|
|
|
* @return An array of chracter attribute keys which this font understands.
|
|
|
|
*
|
|
|
|
* @see getAttributes()
|
|
|
|
* @see java.text.AttributedCharacterIterator.Attribute
|
|
|
|
* @see java.awt.font.TextAttribute
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public AttributedCharacterIterator.Attribute[] getAvailableAttributes()
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getAvailableAttributes (this);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a baseline code (one of {@link ROMAN_BASELINE}, {@link
|
|
|
|
* CENTER_BASELINE} or {@link HANGING_BASELINE}) indicating which baseline
|
|
|
|
* this font will measure baseline offsets for, when presenting glyph
|
|
|
|
* metrics for a given character.
|
|
|
|
*
|
|
|
|
* Baseline offsets describe the position of a glyph relative to an
|
|
|
|
* invisible line drawn under, through the center of, or over a line of
|
|
|
|
* rendered text, respectively. Different scripts use different baseline
|
|
|
|
* modes, so clients should not assume all baseline offsets in a glyph
|
|
|
|
* vector are from a common baseline.
|
|
|
|
*
|
|
|
|
* @param c The character code to select a baseline mode for.
|
|
|
|
*
|
|
|
|
* @return The baseline mode which would be used in a glyph associated
|
|
|
|
* with the provided character.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @see LineMetrics.getBaselineOffsets()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public byte getBaselineFor (char c)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getBaselineFor (this, c);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the family name of this font. A family name describes a
|
|
|
|
* typographic style (such as Helvetica or Palatino). It is more specific
|
|
|
|
* than a logical font name (such as Sans Serif) but less specific than a
|
|
|
|
* font face name (such as Helvetica Bold).
|
|
|
|
*
|
|
|
|
* @param lc The locale in which to describe the name of the font family.
|
|
|
|
*
|
|
|
|
* @return A string containing the font family name, localized for the
|
|
|
|
* provided locale.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @see getName()
|
|
|
|
* @see getFontName()
|
|
|
|
* @see GraphicsEnvironment.getAvailableFontFamilyNames()
|
|
|
|
* @see Locale
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public String getFamily (Locale lc)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getFamily (this, lc);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a font appropriate for the given attribute set.
|
|
|
|
*
|
|
|
|
* @param attributes The attributes required for the new font.
|
|
|
|
*
|
|
|
|
* @return A new Font with the given attributes.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @see TextAttribure
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public static Font getFont (Map attributes)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return getFontFromToolkit (null, attributes);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the font face name of the font. A font face name describes a
|
|
|
|
* specific variant of a font family (such as Helvetica Bold). It is more
|
|
|
|
* specific than both a font family name (such as Helvetica) and a logical
|
|
|
|
* font name (such as Sans Serif).
|
|
|
|
*
|
|
|
|
* @return The font face name of the font.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @see getName()
|
|
|
|
* @see getFamily()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public String getFontName ()
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getFontName (this);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the font face name of the font. A font face name describes a
|
|
|
|
* specific variant of a font family (such as Helvetica Bold). It is more
|
2003-12-31 08:58:31 +00:00
|
|
|
* specific than both a font family name (such as Helvetica).
|
2003-08-13 16:49:58 +00:00
|
|
|
*
|
|
|
|
* @param lc The locale in which to describe the name of the font face.
|
|
|
|
*
|
|
|
|
* @return A string containing the font face name, localized for the
|
|
|
|
* provided locale.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @see getName()
|
|
|
|
* @see getFamily()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public String getFontName (Locale lc)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getFontName (this, lc);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the italic angle of this font, a measurement of its slant when
|
|
|
|
* style is {@link ITALIC}. The precise meaning is the inverse slope of a
|
|
|
|
* caret line which "best measures" the font's italic posture.
|
|
|
|
*
|
|
|
|
* @return The italic angle.
|
|
|
|
*
|
|
|
|
* @see TextAttribute.POSTURE
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public float getItalicAngle ()
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getItalicAngle (this);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a {@link LineMetrics} object constructed with the specified
|
|
|
|
* text and {@link FontRenderContext}.
|
|
|
|
*
|
|
|
|
* @param text The string to calculate metrics from.
|
|
|
|
* @param begin Index of first character in <code>text</code> to measure.
|
|
|
|
* @param limit Index of last character in <code>text</code> to measure.
|
|
|
|
* @param rc Context for calculating precise glyph placement and hints.
|
|
|
|
*
|
|
|
|
* @return A new {@link LineMetrics} object.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
|
|
* invalid in <code>text</code>.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public LineMetrics getLineMetrics(String text, int begin,
|
|
|
|
int limit, FontRenderContext rc)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getLineMetrics (this, new StringCharacterIterator (text),
|
|
|
|
begin, limit, rc);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a {@link LineMetrics} object constructed with the specified
|
|
|
|
* text and {@link FontRenderContext}.
|
|
|
|
*
|
|
|
|
* @param chars The string to calculate metrics from.
|
|
|
|
* @param begin Index of first character in <code>text</code> to measure.
|
|
|
|
* @param limit Index of last character in <code>text</code> to measure.
|
|
|
|
* @param rc Context for calculating precise glyph placement and hints.
|
|
|
|
*
|
|
|
|
* @return A new {@link LineMetrics} object.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
|
|
* invalid in <code>chars</code>.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public LineMetrics getLineMetrics(char[] chars, int begin,
|
|
|
|
int limit, FontRenderContext rc)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getLineMetrics (this, new StringCharacterIterator (new String(chars)),
|
|
|
|
begin, limit, rc);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a {@link LineMetrics} object constructed with the specified
|
|
|
|
* text and {@link FontRenderContext}.
|
|
|
|
*
|
|
|
|
* @param ci The string to calculate metrics from.
|
|
|
|
* @param begin Index of first character in <code>text</code> to measure.
|
|
|
|
* @param limit Index of last character in <code>text</code> to measure.
|
|
|
|
* @param rc Context for calculating precise glyph placement and hints.
|
|
|
|
*
|
|
|
|
* @return A new {@link LineMetrics} object.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
|
|
* invalid in <code>ci</code>.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public LineMetrics getLineMetrics (CharacterIterator ci, int begin,
|
|
|
|
int limit, FontRenderContext rc)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getLineMetrics (this, ci, begin, limit, rc);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the maximal bounding box of all the bounding boxes in this
|
|
|
|
* font, when the font's bounding boxes are evaluated in a given {@link
|
|
|
|
* FontRenderContext}
|
|
|
|
*
|
|
|
|
* @param rc Context in which to evaluate bounding boxes.
|
|
|
|
*
|
|
|
|
* @return The maximal bounding box.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public Rectangle2D getMaxCharBounds (FontRenderContext rc)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getMaxCharBounds (this, rc);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the glyph code this font uses to represent missing glyphs. This
|
|
|
|
* code will be present in glyph vectors when the font was unable to
|
|
|
|
* locate a glyph to represent a particular character code.
|
|
|
|
*
|
|
|
|
* @return The missing glyph code.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public int getMissingGlyphCode ()
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getMissingGlyphCode (this);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the overall number of glyphs in this font. This number is one
|
|
|
|
* more than the greatest glyph code used in any glyph vectors this font
|
|
|
|
* produces. In other words, glyph codes are taken from the range
|
|
|
|
* <code>[ 0, getNumGlyphs() - 1 ]</code>.
|
|
|
|
*
|
|
|
|
* @return The number of glyphs in this font.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public int getNumGlyphs ()
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getMissingGlyphCode (this);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the PostScript Name of this font.
|
|
|
|
*
|
|
|
|
* @return The PostScript Name of this font.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @see getName()
|
|
|
|
* @see getFamily()
|
|
|
|
* @see getFontName()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public String getPSName ()
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getPostScriptName (this);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the logical bounds of the specified string when rendered with this
|
|
|
|
* font in the specified {@link FontRenderContext}. This box will include the
|
|
|
|
* glyph origin, ascent, advance, height, and leading, but may not include all
|
|
|
|
* diacritics or accents. To get the complete visual bounding box of all the
|
|
|
|
* glyphs in a run of text, use the {@link TextLayout#getBounds} method of
|
|
|
|
* {@link TextLayout}.
|
|
|
|
*
|
|
|
|
* @param str The string to measure.
|
|
|
|
* @param frc The context in which to make the precise glyph measurements.
|
|
|
|
*
|
|
|
|
* @return A bounding box covering the logical bounds of the specified text.
|
|
|
|
*
|
|
|
|
* @see createGlyphVector()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public Rectangle2D getStringBounds (String str, FontRenderContext frc)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return getStringBounds (str, 0, str.length () - 1, frc);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the logical bounds of the specified string when rendered with this
|
|
|
|
* font in the specified {@link FontRenderContext}. This box will include the
|
|
|
|
* glyph origin, ascent, advance, height, and leading, but may not include all
|
|
|
|
* diacritics or accents. To get the complete visual bounding box of all the
|
|
|
|
* glyphs in a run of text, use the {@link TextLayout#getBounds} method of
|
|
|
|
* {@link TextLayout}.
|
|
|
|
*
|
|
|
|
* @param str The string to measure.
|
|
|
|
* @param begin Index of the first character in <code>str</code> to measure.
|
|
|
|
* @param limit Index of the last character in <code>str</code> to measure.
|
|
|
|
* @param frc The context in which to make the precise glyph measurements.
|
|
|
|
*
|
|
|
|
* @return A bounding box covering the logical bounds of the specified text.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
|
|
* invalid in <code>str</code>.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @see createGlyphVector()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public Rectangle2D getStringBounds (String str, int begin,
|
|
|
|
int limit, FontRenderContext frc)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getStringBounds (this, new StringCharacterIterator(str), begin, limit, frc);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the logical bounds of the specified string when rendered with this
|
|
|
|
* font in the specified {@link FontRenderContext}. This box will include the
|
|
|
|
* glyph origin, ascent, advance, height, and leading, but may not include all
|
|
|
|
* diacritics or accents. To get the complete visual bounding box of all the
|
|
|
|
* glyphs in a run of text, use the {@link TextLayout#getBounds} method of
|
|
|
|
* {@link TextLayout}.
|
|
|
|
*
|
|
|
|
* @param ci The text to measure.
|
|
|
|
* @param begin Index of the first character in <code>ci</code> to measure.
|
|
|
|
* @param limit Index of the last character in <code>ci</code> to measure.
|
|
|
|
* @param frc The context in which to make the precise glyph measurements.
|
|
|
|
*
|
|
|
|
* @return A bounding box covering the logical bounds of the specified text.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
|
|
* invalid in <code>ci</code>.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @see createGlyphVector()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public Rectangle2D getStringBounds (CharacterIterator ci, int begin,
|
|
|
|
int limit, FontRenderContext frc)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getStringBounds (this, ci, begin, limit, frc);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the logical bounds of the specified string when rendered with this
|
|
|
|
* font in the specified {@link FontRenderContext}. This box will include the
|
|
|
|
* glyph origin, ascent, advance, height, and leading, but may not include all
|
|
|
|
* diacritics or accents. To get the complete visual bounding box of all the
|
|
|
|
* glyphs in a run of text, use the {@link TextLayout#getBounds} method of
|
|
|
|
* {@link TextLayout}.
|
|
|
|
*
|
|
|
|
* @param chars The text to measure.
|
|
|
|
* @param begin Index of the first character in <code>ci</code> to measure.
|
|
|
|
* @param limit Index of the last character in <code>ci</code> to measure.
|
|
|
|
* @param frc The context in which to make the precise glyph measurements.
|
|
|
|
*
|
|
|
|
* @return A bounding box covering the logical bounds of the specified text.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
|
|
* invalid in <code>chars</code>.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*
|
|
|
|
* @see createGlyphVector()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public Rectangle2D getStringBounds (char[] chars, int begin,
|
|
|
|
int limit, FontRenderContext frc)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getStringBounds (this, new StringCharacterIterator (new String (chars)),
|
|
|
|
begin, limit, frc);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a copy of the affine transformation this font is currently
|
|
|
|
* subject to, if any.
|
|
|
|
*
|
|
|
|
* @return The current transformation.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public AffineTransform getTransform ()
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.getTransform (this);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Indicates whether this font's line metrics are uniform. A font may be
|
|
|
|
* composed of several "subfonts", each covering a different code range,
|
|
|
|
* and each with their own line metrics. A font with no subfonts, or
|
|
|
|
* subfonts with identical line metrics, is said to have "uniform" line
|
|
|
|
* metrics.
|
|
|
|
*
|
|
|
|
* @return Whether this font has uniform line metrics.
|
|
|
|
*
|
|
|
|
* @see LineMetrics
|
|
|
|
* @see getLineMetrics()
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public boolean hasUniformLineMetrics ()
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.hasUniformLineMetrics (this);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Indicates whether this font is subject to a non-identity affine
|
|
|
|
* transformation.
|
|
|
|
*
|
|
|
|
* @return <code>true</code> iff the font has a non-identity affine
|
|
|
|
* transformation applied to it.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public boolean isTransformed ()
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.isTransformed (this);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Produces a glyph vector representing a full layout fo the specified
|
|
|
|
* text in this font. Full layouts may include complex shaping and
|
|
|
|
* reordering operations, for scripts such as Arabic or Hindi.
|
|
|
|
*
|
|
|
|
* Bidirectional (bidi) layout is not performed in this method; text
|
|
|
|
* should have its bidi direction specified with one of the flags {@link
|
|
|
|
* LAYOUT_LEFT_TO_RIGHT} or {@link LAYOUT_RIGHT_TO_LEFT}.
|
|
|
|
*
|
|
|
|
* Some types of layout (notably Arabic glyph shaping) may examine context
|
|
|
|
* characters beyond the bounds of the indicated range, in order to select
|
|
|
|
* an appropriate shape. The flags {@link LAYOUT_NO_START_CONTEXT} and
|
|
|
|
* {@link LAYOUT_NO_LIMIT_CONTEXT} can be provided to prevent these extra
|
|
|
|
* context areas from being examined, for instance if they contain invalid
|
|
|
|
* characters.
|
|
|
|
*
|
|
|
|
* @param frc Context in which to perform the layout.
|
|
|
|
* @param chars Text to perform layout on.
|
|
|
|
* @param start Index of first character to perform layout on.
|
|
|
|
* @param limit Index of last character to perform layout on.
|
|
|
|
* @param flags Combination of flags controlling layout.
|
|
|
|
*
|
|
|
|
* @return A new {@link GlyphVector} representing the specified text.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if the range [begin, limit] is
|
|
|
|
* invalid in <code>chars</code>.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public GlyphVector layoutGlyphVector (FontRenderContext frc,
|
|
|
|
char[] chars, int start,
|
|
|
|
int limit, int flags)
|
2003-08-13 16:49:58 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer.layoutGlyphVector (this, frc, chars, start, limit, flags);
|
2003-08-13 16:49:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-01-22 22:03:04 +00:00
|
|
|
/**
|
|
|
|
* Returns a native peer object for this font.
|
|
|
|
*
|
|
|
|
* @return A native peer object for this font.
|
2003-05-25 11:24:27 +00:00
|
|
|
*
|
|
|
|
* @deprecated
|
2002-01-22 22:03:04 +00:00
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public FontPeer getPeer ()
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return peer;
|
1999-05-05 04:05:57 -07:00
|
|
|
}
|
2002-01-22 22:03:04 +00:00
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a hash value for this font.
|
|
|
|
*
|
|
|
|
* @return A hash for this font.
|
|
|
|
*/
|
2003-12-31 08:58:31 +00:00
|
|
|
public int hashCode()
|
2002-01-22 22:03:04 +00:00
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return this.toString().hashCode();
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests whether or not the specified object is equal to this font. This
|
|
|
|
* will be true if and only if:
|
|
|
|
* <P>
|
|
|
|
* <ul>
|
|
|
|
* <li>The object is not <code>null</code>.
|
|
|
|
* <li>The object is an instance of <code>Font</code>.
|
2003-12-31 08:58:31 +00:00
|
|
|
* <li>The object has the same names, style, size, and transform as this object.
|
2002-01-22 22:03:04 +00:00
|
|
|
* </ul>
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if the specified object is equal to this
|
|
|
|
* object, <code>false</code> otherwise.
|
|
|
|
*/
|
|
|
|
public boolean
|
|
|
|
equals(Object obj)
|
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
if (obj == null)
|
2002-01-22 22:03:04 +00:00
|
|
|
return(false);
|
|
|
|
|
2003-12-31 08:58:31 +00:00
|
|
|
if (!(obj instanceof Font))
|
2002-01-22 22:03:04 +00:00
|
|
|
return(false);
|
|
|
|
|
2003-12-31 08:58:31 +00:00
|
|
|
Font f = (Font)obj;
|
2002-01-22 22:03:04 +00:00
|
|
|
|
2003-12-31 08:58:31 +00:00
|
|
|
return (f.getName ().equals (this.getName ()) &&
|
|
|
|
f.getFamily ().equals (this.getFamily ()) &&
|
|
|
|
f.getFontName ().equals (this.getFontName ()) &&
|
|
|
|
f.getTransform ().equals (this.getTransform ()) &&
|
|
|
|
f.getSize() == this.getSize() &&
|
|
|
|
f.getStyle() == this.getStyle());
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a string representation of this font.
|
|
|
|
*
|
|
|
|
* @return A string representation of this font.
|
|
|
|
*/
|
|
|
|
public String
|
|
|
|
toString()
|
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return(getClass().getName()
|
|
|
|
+ "(logical=" + getName ()
|
|
|
|
+ ",family=" + getFamily ()
|
[multiple changes]
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JTextArea.java
(setLineWrap): Fire property change event after new value is set.
(setTabSize): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JTable.java
(autoCreateColumnsFromModel): New field.
(autoResizeMode): Likewise.
(cellEditor): Likewise.
(cellSelectionEnabled): Likewise.
(columnModel): Likewise.
(dataModel): Likewise.
(defaultEditorsByColumnClass): Likewise.
(defaultRenderersByColumnClass): Likewise.
(editingColumn): Likewise.
(editingRow): Likewise.
(gridColor): Likewise.
(preferredViewportSize): Likewise.
(rowHeight): Likewise.
(rowMargin): Likewise.
(rowSelectionAllowed): Likewise.
(selectionBackground): Likewise.
(selectionForeground): Likewise.
(selectionModel): Likewise.
(showHorizontalLines): Likewise.
(showVerticalLines): Likewise.
(tableHeader): Likewise.
(JTable): Implemented.
(getColumnModel): Likewise.
(getSelectedRow): Likewise.
(getSelectionModel): Likewise.
(setModel): Likewise.
(setSelectionModel): Likewise.
(createScrollPaneForTable): New method.
(createDefaultDataModel): Likewise.
(createDefaultListSelectionModel): Likewise.
(getModel): Likewise.
(getTableHeader): Likewise.
(setTableHeader): Likewise.
(getColumnSelectionAllowed): Likewise.
(setColumnSelectionAllowed): Likewise.
(getRowSelectionAllowed): Likewise.
(setRowSelectionAllowed): Likewise.
(getAutoResizeMode): Likewise.
(setAutoResizeMode): Likewise.
(getColumnCount): Likewise.
(getRowCount): Likewise.
(getCellRenderer): Likewise.
* javax/swing/JTree.java
(cellRenderer): New field.
(editable): Likewise.
(rootVisible): Likewise.
(showsRootHandles): Likewise.
(getModel): New method.
(setModel): Likewise.
(isEditable): Likewise.
(setEditable): Likewise.
(isRootVisbile): Likewise.
(setRootVisible): Likewise.
(getShowsRootHandles): Likewise.
(setShowRootHandles): Likewise.
(getCellRenderer): Likewise.
(setCellRenderer): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JFormattedTextField.java
(setDocument): Implemented.
* javax/swing/JRootPane.java:
Fixed javadocs.
* javax/swing/JTable.java
(getDefaultRenderer): New method.
* javax/swing/JTextField.java
(setFont): Likewise.
(getPreferredSize): Likewise.
* javax/swing/JToggleButton.java
(getAccessibleContext): Fix javadoc.
* javax/swing/JTree.java:
Add some javadocs.
* javax/swing/JViewport.java:
Likewise.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java:
Collect all native method declaration at the top.
(create): Set the filename filter if necessary.
(setDirectory): Call nativeSetDirectory().
(setFilenameFilter): Implement.
(filenameFilterCallback): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
(create): Configure dialog to show hidden files.
(filenameFilterCallback): New function.
(nativeSetFilenameFilter): New function.
(nativeSetDirectory): New function.
2004-07-21 Kim Ho <kho@redhat.com>
* javax/swing/plaf/basic/BasicSliderUI.java:
Ran Jalopy.
(paintTrack): Fill the track before painting
the borders.
2004-07-21 Graydon Hoare <graydon@redhat.com>
patch from Roman Kennke <roman@ontographics.com>
* javax/swing/Spring.java: New file.
* javax/swing/SpringLayout.java: New file.
* Makefile.am: Add new files.
* Makefile.in: Regenerate.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* javax/swing/plaf/basic/BasicSplitPaneUI.java: Minor layout fixes.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java: Likewise.
* javax/swing/ScrollPaneLayout.java: Likewise.
2004-07-21 Kim Ho <kho@redhat.com>
* javax/swing/DefaultDesktopManager.java:
(findMinimum): Removed.
(resizeFrame): Trust the UI to pass valid
bounds.
* javax/swing/JOptionPane.java:
Implemented showInternalXXXDialog methods.
(startModal): New method.
* javax/swing/plaf/basic/BasicInternalFrameUI.java:
(BorderListener::mouseDragged): Verify that the new
bounds are valid before passing them to the DesktopManager.
(preferredLayoutSize): Delegate
to getSize.
(minimumLayoutSize): Ditto.
(getSize): New method.
(GlassPaneDispatcher): Reimplemented by copying
a stripped down LightweightDispatcher from Container.
(getMinimumSize): Call minimumLayoutSize.
* javax/swing/plaf/basic/BasicOptionPaneUI.java:
Ran Jalopy.
(mousePressed): Add ability to properly close
JInternalFrames.
* javax/swing/plaf/basic/BasicToolBarUI.java:
(DragWindow): Set owner for DragWindow.
2004-07-21 Jerry Quinn <jlquinn@optonline.net>
* java/awt/image/ShortLookupTable.java: New file.
* java/awt/image/ByteLookupTable.java: New file.
* Makefile.am: Added new files.
* Makefile.in: Regenerated.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
(create(GtkContainerPeer)): New native method.
(create()): Call native create(), passing in the parent frame
as the paramter. Natively set the current file and directory.
(setFile): Construct an absolute filename before passing it to
the native peer.
(nativeGetDirectory): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
(window_closed): Removed.
(ok_clicked): Likewise.
(cancel_clicked): Likewise.
(handle_response): New method.
(create): Use GtkFileChooserDialog.
(connectSignals): Connect to handle_response.
(nativeGetDirectory): New method.
(nativeSetFile): Use GtkFileChooserDialog.
2004-07-21 Jerry Quinn <jlquinn@optonline.net>
* java/awt/image/LookupTable.java: New file.
* Makefile.am: Added new file.
* Makefile.in: Regenerated.
2004-07-21 Jerry Quinn <jlquinn@optonline.net>
* java/awt/image/Kernel.java: New file.
* Makefile.am: Added new file.
* Makefile.in: Regenerated.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JCheckBoxMenuItem.java: Fixed Javadocs.
* javax/swing/JMenu.java: Likewise.
* javax/swing/JMenuBar.java: Likewise.
(MARGIN_CHANGED_PROPERTY): New property.
(setMargin): Implemented.
* javax/swing/JMenuItem.java: Fixed javadocs.
* javax/swing/JPopupMenuUI.java: Fixed javadocs.
(LABEL_CHANGED_PROPERTY): New property.
(add): changed to use createActionComponent.
(createActionComponent): Implemented.
(setLabel): Fire PropertyChangeEvent if label property
changes.
* javax/swing/JRadioButtonMenuItem.java: Fixed javadocs.
* javax/swing/plaf/basic/BasicMenuBarUI.java: Likewise.
(ContainerHandler): Repaint if margin property has changed.
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(installUI): Call installComponents().
(uninstallUI): Call uinstallComponents().
* javax/swing/plaf/basic/BasicMenuUI.java:
Fixed javadocs.
* javax/swing/plaf/basic/BasicPopupMenuUI.java:
Likewise.
2004-07-21 Kim Ho <kho@redhat.com>
* javax/swing/plaf/basic/BasicToolBarUI.java:
(DragWindow): Use the right constructor.
2004-07-21 Kim Ho <kho@redhat.com>
* javax/swing/JToolBar.java:
(layoutContainer): Use getComponents.
* javax/swing/plaf/basic/BasicToolBarUI.java:
(DragWindow): Don't use SwingUtilities'
getOwnerFrame
(ToolBarDialog): ditto.
2004-07-21 Kim Ho <kho@redhat.com>
* javax/swing/JRootPane.java:
Ran jalopy.
(layoutContainer): Set the glasspane's size to
be the same as the content pane.
(createGlassPane): Set opaque property to false.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java (requestFocus()): Don't handle Panels
specially.
(requestFocus(boolean)): Likewise.
(requestFocusInWindow(boolean)): Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c (create):
Set GTK_CAN_FOCUS flag.
2004-07-21 Kim Ho <kho@redhat.com>
* Makefile.am: Added new file.
* Makefile.in: Regenerated.
* gcj/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* javax/swing/AbstractButton.java:
Add rollOverEnabled property.
(setRolloverEnabled): Use new property.
(isRolloverEnabled): Use new property.
* javax/swing/JTabbedPane.java:
(setComponent): Remove useless JTabbedPane.this.
* javax/swing/JToolBar.java: Finish implementation.
* javax/swing/plaf/basic/BasicArrowButton.java:
(paint): Moved border painting to a border.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Change JToolBar look and feel defaults.
* javax/swing/plaf/basic/BasicOptionPaneUI.java
(actionPerformed): Return Integer index instead of name.
(addButtonComponents): Check to see if component is
JButton last.
(createMessageArea): Don't use components that are not
completed yet.
(getIconForType): Use temporary icons.
* javax/swing/plaf/basic/BasicSliderUI.java:
(mousePressed): Do not return if it's on thumb.
(paintMinorTickForHorizSlider): Use BLACK to paint ticks.
(paintMinorTickForVertSlider): ditto.
(paintMajorTickForHorizSlider): ditto.
(paintMajorTickForVertSlider): ditto.
* javax/swing/plaf/basic/BasicSplitPaneDivider.java:
Add a border around the SplitPaneDivider.
* javax/swing/plaf/basic/BasicSplitPaneUI.java:
Remove comments.
* javax/swing/plaf/basic/BasicToolBarSeparatorUI.java:
New file. Implemented.
* javax/swing/plaf/basic/BasicToolBarUI.java:
Implemented.
* testsuite/Makefile.in: Regenerated.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* javax/swing/Timer.java (run): Queue events each time cycle.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkImagePainter.java
(imageComplete): Call image.imageComplete().
* java/awt/image/MemoryImageSource.java:
Reimplement consumers as a Vector instead of a Hashtable. This is
because enumeration on a Hashtable is not thread-safe.
(addConsumer): Adapt to Vector consumers.
(isConsumer): Adapt to Vector consumers.
(removeConsumer): Adapt to Vector consumers.
(startProduction): Adapt to Vector consumers. Call imageComplete()
with STATICIMAGEDONE flag instead of SINGLEFRAME flag.
(newPixels): Adapt to Vector consumers.
(sendPicture): Set the color model of the image consumer.
(newPixels(IIII)): Adapt to Vector consumers.
(newPixels(IIIIB)): Adapt to Vector consumers.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java (deliverEvent): Implement.
(postEvent): Implement.
(handleEvent): Implement.
(translateEvent): New method.
(dispatchEventImpl): Document. Add AWT 1.0 event handling.
* java/awt/Container.java (deliverEvent): Implement.
* java/awt/Event.java (paramString): Fix formatting.
* java/awt/Font.java (toString): Likewise.
* java/awt/Window.java (postEvent): Implement.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/DefaultKeyboardFocusManager.java (dispatchEvent):
Set window's focus owner upon receiving a FOCUS_LOST event.
* java/awt/Window.java (Window()): Refocus the previously
focused component within the window when the window regains the
top-level focus.
(setFocusOwner): New method.
* java/awt/Component.java (requestFocus): Add FIXME.
* libgcj.pc.in: Remove library flags.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkPanelPeer.java (handleEvent): Handle
MOUSE_PRESSED event.
* java/awt/Component.java (requestFocus()): Handle Panel
specially. Post FOCUS_LOST event on opposite component.
(requestFocus(boolean)): Likewise.
(requestFocusInWindow(boolean)): Likewise.
(paramString): Reorder dimension fields.
* java/awt/Container.java (paramString): Fix string format.
* java/awt/DefaultKeyboardFocusManager.java (dispatchEvent):
Handle FOCUS_LOST events. Don't handle Windows specially. Only
process key events if the focus owner is non-null.
(dispatchKeyEvent): Likewise.
* java/awt/Frame.java (paramString): Fix formatting.
(generateName): New method.
(getUniqueLong): Likewise.
* java/awt/KeyboardFocusManager.java (getFocusOwner): Check if
the temporary focus owner is null. If so, return the permanent
focus owner.
* java/awt/Panel.java (generateName): New method.
(getUniqueLong): Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Rework
signal handling to make callbacks more specific.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/Position.java
(Bias): Implemented.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/LookAndFeel.java
(provideErrorFeedback): New method.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JTextArea.java
(tabSize): New field.
(getTabSize): New method.
(setTabSize): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/ActionMap.java:
Fixed javadocs all over.
(serialVersionUID): Made private.
(parent): Don't explicitely initialize with default value.
(get): SImplified.
(keys): Reimplemented.
(allKeys): Likewise.
(convertSet): Removed.
* javax/swing/ComponentInputMap.java:
Fixed javadocs all over.
(ComponentInputMap): Implemented.
(put): Likewise.
(clear): Likewise.
(remove): Likewise.
(SetParent): Likewise.
(getComponent): Likewise.
* javax/swing/InputMap.java:
Fixed javadocs all over.
(serialVersionUID): Made private.
(parent): Don't explicitely initialize with default value.
(get): SImplified.
(keys): Reimplemented.
(allKeys): Likewise.
(convertSet): Removed.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/ActionMap.java,
javax/swing/ComponentInputMap.java,
javax/swing/InputMap.java,
javax/swing/table/DefaultTableColumnModel.java,
javax/swing/table/TableColumn.java,
javax/swing/table/TableColumnModel.java,
javax/swing/table/TableModel.java,
javax/swing/text/AbstractDocument.java,
javax/swing/text/TextAction.java:
Reformated.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GtkToolkit.java (bufferedImageOrError):
Make method non-static.
* javax/swing/AbstractButton.java:
Rename fields to match property names where possible.
(iconTextGap): New property.
* javax/swing/JCheckBox.java: Match AbstractButton changes.
(init) New method, call from after various constructors.
* javax/swing/JComponent.java (revalidate):
Invalidate before queueing repair.
* javax/swing/JList.java (getPreferredScrollableViewportSize):
Reimplement in terms of visibleRowCount property.
* javax/swing/JMenuButton.java: Match AbstractButton changes.
* javax/swing/JScrollPane.java (createScrollListener):
Remove tracing chatter.
* javax/swing/JToggleButton.java: Match AbstractButton changes.
* javax/swing/RepaintManager.java (addInvalidComponent):
Don't invalidate.
* javax/swing/ScrollPaneLayout.java: Various corrections to layout
calculations.
* javax/swing/SwingUtilities.java (layoutCompoundLabel):
Mimic sun behavior on top left/right positioning.
* javax/swing/ViewportLayout.java (preferredLayoutSize):
Remove mistaken use of preferredScrollableViewportSize here.
(layoutContainer): Use view's preferred size as basis.
* javax/swing/plaf/basic/BasicButtonUI.java:
Set, get, and use textIconGap property.
(paint) Paint text returned from layout (with ellipsis).
* javax/swing/plaf/basic/BasicListUI.java:
Remove tracing chatter, correct various minor calculations.
(getCellBounds): Update layout state before calculating.
* javax/swing/plaf/basic/BasicLookAndFeel.java (Button.Margin):
Use margin default similar to sun's.
* javax/swing/plaf/basic/BasicScrollBarUI.java (ArrowIcon):
(createIncreaseIcon): Center icon, minimize margins.
(createDecreaseIcon): Likewise.
* javax/swing/plaf/basic/BasicScrollPaneUI.java (installDefaults):
Implement.
(installUI): Call it.
(uninstallDefaults): Implement.
(uninstallUI): Call it.
* javax/swing/plaf/basic/BasicToolBarUI.java (DragWindow):
Call existing Window constructor.
* javax/swing/plaf/basic/BasicViewportUI.java (paint):
Set clip before painting.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JMenuItem.java:
(processMouseEvent): Reimplemented to deal with
mouse drag events.
(createMenuDragMouseEvent): New private helper method.
Creates MenuDragMouseEvent.
* javax/swing/MenuSelectionManager.java
(componentForPoint): Implemented.
(isComponentPartOfCurrentMenu): Made public.
(processMouseEvent): Reimplemented to deal with
mouse drag events.
(setSelectedPath): Corrected small mistake that caused
path to be set incorrectly.
(getPath): If given component is JMenu then also add this
menu's popup menu to the selected path.
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(getPath): Ditto.
(getPreferredSize): Call getPreferredMenuItemSize().
(getPreferredItemSize): Moved code from getPreferredSize to here.
(installListeners): Install MouseMotionListeners.
(MouseInputHandler): Pass mouse release event to MenuSelectionManager
if mouse wasn't released in the bounds of this menu item.
(MenuDragMouseHandler): Implemented.
* javax/swing/plaf/basic/BasicMenuUI.java:
(installListeners): Install MouseMotionListener and
MenuDrageMouseListener.
(MenuDragMouseHandler): Implemented.
* javax/swing/plaf/basic/BasicPopupMenuUI.java:
(uninstallListeners): Implemented.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JCheckBox.java: Reformated.
(JCheckBox): Fixed all constructors.
(isBorderPaintedFlat): New method.
(setBorderPaintedFlat): New method.
* javax/swing/JEditorPane.java
(createEditorKitForContentType): Made public.
(scrollToReference): Likewise.
* javax/swing/JTextArea.java
(setLineWrap): Fire property change.
* javax/swing/JToggleButton.java
(JToggleButton): New constructor.
(JToggleButton): Simplified.
* javax/swing/text/AttributeSet.java
(FontAttribute): Renamed from FontCharacterAttribute.
* javax/swing/text/JTextComponent.java
(KeyBinBinding): Added javadoc.
(JTextComponent): Likewise.
(getAccessibleContext): Fixed javadoc.
* javax/swing/text/View.java
(View): Added javadoc.
* javax/swing/text/TabableView.java: New file.
* Makefile.am: Added javax/swing/text/TabableView.java.
* Makefile.in: Regenerated.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* java/awt/image/BufferedImage.java (getSource): Remove tracing chatter.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(GtkErrorImage): New helper class.
(bufferedImageOrError): New helper method.
(createImage): Use it.
2004-07-21 David Jee <djee@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
(setCaretPosition): Scroll the text view so the new caret position
is visible on screen.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setBounds): Do not validate awtComponent here.
* gnu/java/awt/peer/gtk/GtkScrollPanePeer.java
(getPreferredSize): New method.
* java/awt/ScrollPane.java
(ScrollPane): Set default size to 100x100.
(addNotify): If child is not a Panel, wrap it with a new Panel.
(paramString): Implement.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JMenu.java:
(setSelected): Display popup menu only if this menu
is showing on the screen.
* javax/swing/JPopupMenu.java:
(processMouseEvent): Added comment.
(processKeyEvent): Likewise.
* javax/swing/MenuSelectionManager.java:
(clearSelectedPath): Only fireStateChanged() after
selected path was changed, not before.
(setSelectedPath): Likewise.
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(paintMenuItem): Corrected position of menu item's
icon.
* javax/swing/plaf/basic/BasicPopupMenuUI.java:
(installUI): Correct setDefaultLightWeightPopupEnabled call.
(popupMenuCanceled): Reimplemented.
(popupMenuWillBecomeVisible): Select first menu item by default
when displaying free floating popup menus.
(TopWindowListener): Reimplemented.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Panel.java (dispatchEventImpl): Override to prevent
Panel from being painted twice when it is first shown.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* java/awt/Window.java: Reverted changes from my
previous patch for creating window without an owner.
* javax/swing/SwingUtilities.java:
(SwingUtilities.OwnerFrame): made static.
(OwnerFrame.setVisible): New method. Overridden with
empty implementation.
(OwnerFrame.isShowing): New method. Ovverridden
to return always true.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(GtkComponentPeer): Remove temporary try/catch block.
(setVisible): Call show and hide.
(show): Make native.
(hide): Likewise.
(getArgs): Don't add "visible" argument.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(property_notify_predicate): Return Bool instead of int.
(find_layout): New function.
(connectJObject): Call find_layout.
(connectSignals): Likewise.
(moveLayout): Likewise.
(gtkLayoutSetVisible): Likewise.
2004-07-21 Mark Wielaard <mark@klomp.org>
* java/awt/event/InvocationEvent.java (dispatch): Synchronize
on notifier object before calling notifyAll().
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* java/awt/Window.java: Changed constructors to use new
method that is described below. Constructors call this
methods only if newly created window should have an owner.
(setWindowOwner): New method. Implementation for
this method is moved from this(owner,configuration).
* javax/swing/JWindow.java:
(JWindow): Reimplement to use SwingUtilities.ownerFrame
instead of owner.
* javax/swing/SwingUtilities.java:
(ownerFrame): Change type of this field to OwnerFrame.
(getOwnerFrame): Changed to return object of type OwnerFrame.
(SwingUtilities.OwnerFrame): New class. Represents owner
of a Window that is not provided with one.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/AbstractButton.java:
(configurePropertiesFromAction): Set action command
to button's text by default if action command is not
explicitely specified.
* javax/swing/JMenu.java: Remove unnecessary listener
and methods relevant to it.
(setSelected): Reimplemented.
(menuSelectionChanged): Moved most part of implementation to
setSelected() and call it instead.
* javax/swing/JMenuItem.java:
(init): Comment out statement that sets paint_border to false.
(configurePropertiesFromAction): Do not set accelerator
for JMenu.
(menuSelectionChanged): Change selected index in the selection
model of menu item's parent.
* javax/swing/JPopupMenu.java:
(remove): Set constraints.fill field to GridBagConstraints.BOTH
instead of GridBagConstraints.HORIZONTAL.
(insert): Likewise.
(createActionChangeListener): Implemented.
(setVisible): Correct location of HeavyWeightMenu and
don't firePopupMenuCanceled().
(menuSelectionChanged): Implemented.
(ActionChangeListener): New Listener. Implemented.
* javax/swing/plaf/basic/BasicMenuBarUI.java:
(BasicMenuBarUI.ContainerHandler): Implemented.
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(paintMenuItem): Uncommented out code that paints
icon, now that icons are working properly.
(PropertyChangeListener): Implemented.
* javax/swing/plaf/basic/BasicPopupMenuUI.java:
Added javadocs.
(topWindowListener): New field.
(Constructor): initialize topWindowListener.
(BasicPopupMenuUI.TopWindowListener): Implemented.
(BasicPopupMenuUI.PopupMenuHandler): Implemented.
(BasicPopupMenuUI.TopWindowListener): New ComponentListener.
Implemented.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicButtonUI.java
(paintFocus): Fixed method signature.
(paintButtonPressed): Likewise.
(paintButtonNormal): Likewise.
(paintText): New method.
* javax/swing/plaf/basic/BasicLabelUI.java
(paint): Re-indented.
* javax/swing/plaf/basic/BasicTextUI.java
(installUI): Set parent textComponent to opaque.
* javax/swing/text/DefaultHighlighter.java
(checkPositions): New helper method.
(addHighlight): Throws BadLocationException, check positions.
(changeHighlight): Likewise.
* javax/swing/text/EditorKit.java
(EditorKit): Implements Serializable.
* javax/swing/text/JTextComponent.java
(getUI): Added javadoc.
(setUI): Likewise.
(upadteUI): Added javadoc, don't revalidate and repaint.
2004-07-21 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(ArrangeGrid): Use PREFERREDSIZE instead of MINSIZE.
* javax/swing/AbstractButton.java
(setText): Reindent.
* javax/swing/RepaintManager.java
(addInvalidComponent): Find the first ancestor that isValidateRoot().
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JFormattedTextField.java
(value): New field.
(JFormattedTextField): Implemented.
(getValue): Likewise.
(setValue): Likewise.
* javax/swing/LookAndFeel.java
(getSupportsWindowDecorations): New method.
* javax/swing/UIDefaults.java:
Use java.beans.PropertyChangeSupport instead of doing all ourself.
(addPropertyChangeListener): Made public.
(addResourceBundle): Likewise.
(removeResourceBundle): Likewise.
(setDefaultLocale): Likewise.
* javax/swing/plaf/basic/BasicRootPaneUI.java
(BasicRootPaneUI): Implements PropertyChangeListener.
(propertyChange): New method.
* javax/swing/plaf/basic/BasicTextUI.java
(BasicHighlighter): New inner class.
(createHighlighter): New method.
* javax/swing/plaf/basic/BasicToolBarUI.java
(DragWindow): Extends java.awt.Window.
* javax/swing/text/JTextComponent.java
(getDocument): Removed debug output.
* javax/swing/plaf/basic/BasicTextFieldUI.java,
javax/swing/text/DefaultHighlighter.java,
javax/swing/text/FieldView.java,
javax/swing/text/PlainView.java: New files.
* Makefile.am: Added new files.
* Makefile.in: Regenerated.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JEditorPane.java
(createDefaultEditorKit): Use javax.swing.text.DefaultEditorKit.
(createEditorKitForContentType): Likewise.
* javax/swing/text/DefaultEditorKit.java
(serialVersionUID): Added constant field.
(EndOfLineStringPropery): Fixed typo.
(DefaultEditorKit): New constructor.
* javax/swing/text/Segment.java:
Import java.text.CharacterIterator.
* javax/swing/text/CharacterIterator.java,
javax/swing/text/PlainEditorKit.java: Removed.
* Makefile.am: Removed javax/swing/text/CharacterIterator.java and
javax/swing/text/PlainEditorKit.java.
* Makefile.in: Regenerated.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JButton.java,
javax/swing/text/DefaultEditorKit.java,
javax/swing/text/EditorKit.java,
javax/swing/text/Segment.java,
javax/swing/text/StyledEditorKit.java:
Reformatted.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/ImageIcon.java
(file): Removed.
(description): Renamed from descr.
(ImageIcon): Added missing constructors.
(setParent): Removed.
(setImageObserver): New method.
(getImageObserver): New method.
(paintIcon): Handle observer = null.
* javax/swing/JButton.java
(removeNotify): Fixed javadoc.
(updateUI): Simplified.
* javax/swing/JRootPane.java
(serialVersionUID): New constant field.
* javax/swing/UIManager.java:
Fixed javadocs all over.
(setLookAndFeel): Throws UnsupportedLookAndFeelException.
* javax/swing/text/AbstractDocument.java
(createPosition): Throws BadLocationException.
(getText): Likewise.
(remove): Likewise.
* javax/swing/text/ComponentView.java
(modelToView): Likewise.
* javax/swing/text/DefaultEditorKit.java:
Made all public methods public.
(read): Throws BadLocationException and IOException.
(write): Likewise.
* javax/swing/text/EditorKit.java:
Made all public methods public.
(serialVersionUID): New constant field.
(clone): New method.
(read): Throws BadLocationException and IOException.
(write): Likewise.
* javax/swing/text/Segment.java
(array): Made public.
(count): Likewise.
(offset): Likewise.
(Segment): New constructors.
(clone): Reimplemented.
* javax/swing/text/StyledEditorKit.java
(serialVersionUID): New constant field.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* java/awt/image/BufferedImage.java
(getSource): Implement.
* javax/swing/ImageIcon.java
(ImageIcon): Implement ctor.
* javax/swing/ScrollPaneLayout.java
(preferredLayoutSize): Be more careful about nulls.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AttributeSet.java
(CharacterAttribute): New interface
(ColorAttribute): Likewise.
(FontCharacterAttribute): Likewise.
(ParagraphAttribute): Likewise.
* javax/swing/text/DefaultCaret.java
(moveCaret): New method.
(positionCaret): Likewise.
(repaint): Made protected.
* javax/swing/text/JTextComponent.java
(KeyBinding): Made it static.
* javax/swing/text/View.java
(getContainer): Honor parent == null.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java:
Reformatted.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicRootPaneUI.java:
Import javax.swing.UIManager explicitely.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java
(ScrollingButton): Made it static.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/UIDefaults.java
(ActiveValue): Made public.
(LazyValue): Likewise.
* javax/swing/plaf/basic/BasicTextUI.java
(RootView): Reintroduced.
(view): Removed.
(rootView): New field.
(installUI): Create document if needed, initialize rootView.
(uninstallUI): Hanle rootView.
(paint): Likewise.
(getRootView): Likewise.
(setView): Likewise.
* javax/swing/text/DefaultCaret.java:
Renamed all "evt" variables to "event".
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* libgcj.spec.in: Add -l-java-util-logging.
2004-07-21 Andreas Tobler <a.tobler@schweiz.ch>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
(init_dpi_conversion_factor): Check for int_dpi < 0 in case
gtk-xft-dpi can no calculate the right value.
(dpi_changed_cb): Mark *pspec as unsused.
2004-07-21 David Jee <djee@redhat.com>
* java/awt/Component.java
(move): Delegate to setBounds().
(resize): Likewise.
(reshape): Fix so it repaints parent and self only when necessary.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(GtkComponentPeer): Revert previous patch from 2004-06-22.
(setVisible): Likewise.
(show): Likewise.
(hide): Likewise.
(getArgs): Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(property_notify_predicate): Likewise.
(find_layout): Likewise.
(connectJObject): Likewise.
(connectSignals): Likewise.
(moveLayout): Likewise.
(gtkLayoutSetVisible): Likewise.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* Makefile.am
(jv_convert_LDADD):
(gij_LDADD):
(rmic_LDADD):
(rmiregistry_LDADD): Add lib-java-util-logging.la
* Makefile.in: Regenerate.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(replace): Dont use protected method of java.util.Vector directly.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(installUI): Call specialized install methods.
(installDefaults): New method.
(installListeners): Likewise.
(installKeyboardActions): Likewise.
(uninstallUI): Likewise.
(uninstallDefaults): New method.
(uninstallListeners): Likewise.
(uninstallKeyboardActions): Likewise.
(getPropertyPrefix): New abstract method.
(paint): Made final, just call paintSafely().
(paintSavely): New method.
(paintBackground): Likewise.
(getVisibleEditorRect): Likewise.
* javax/swing/text/LayeredHighlighter.java,
javax/swing/text/TabExpander.java: New files.
* Makefile.am: Added javax/swing/text/LayeredHighlighter.java
and javax/swing/text/TabExpander.java.
* Makefile.in: Regenerated.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(BasicTextUI): Made abstract.
(BasicCaret): New inner class.
(view): Don't explicitely initialize with "null".
(textComponent): New field.
(textColor): Removed.
(disabledTextColor): Removed.
(normalBackgroundColor): Removed.
(RootView): Removed commented out inner class.
(createUI): Removed.
(createCaret): New method.
(getComponent): Likewise.
(installUI): Initialize textComponent only.
(getPreferredSize): Use installed JTextComponent.
(setView): New method.
(create): Likewise.
* javax/swing/text/JTextComponent.java
(highlighter): New field.
(caretColor): Likewise.
(disabledTextColor): Likewise.
(seletedTextColor): Likewise.
(selectionColor): Likewise.
(setUI): New method.
(getCaretColor): Likewise.
(setCaretColor): Likewise.
(getDisabledColor): Likewise.
(setDisabledColor): Likewise.
(getSelectedTextColor): Likewise.
(setSelectedTextColor): Likewise.
(getSelectionColor): Likewise.
(setSelectionColor): Likewise.
(getHighlighter): Likewise.
(setHighlighter): Likewise.
(replaceSelection): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicScrollPaneUI.java
(BasicScrollPaneUI): Implements ScrollPaneConstants.
* javax/swing/plaf/basic/BasicToolBarUI.java
(BasicToolBarUI): Implements SwingConstants.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JPopupMenu.java: Removed CVS tags.
* javax/swing/UIDefaults.java: Reformatted.
* javax/swing/plaf/basic/BasicRootPaneUI.java:
Explicitely import used classes.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(GtkComponentPeer): Remove temporary try/catch block.
(setVisible): Call show and hide.
(show): Make native.
(hide): Likewise.
(getArgs): Don't add "visible" argument.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(property_notify_predicate): Return Bool instead of int.
(find_layout): New function.
(connectJObject): Call find_layout.
(connectSignals): Likewise.
(moveLayout): Likewise.
(gtkLayoutSetVisible): Likewise.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/AbstractButton.java:
(setDisplayedMnemonicIndex): Check if button
text is not null before checking its length.
* javax/swing/JMenuItem.java:
(processMouseEvent): Disarm menu item if mouse has
exited it.
* javax/swing/plaf/basic/BasicMenuUI.java:
(MouseInputHandler.mouseEntered): Do not raise
popup menu if this menu is already selected.
(MouseInputHandler.mousePressed): Do not fire
MenuEvents.
(MenuHandler): Implemented.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JCheckBoxMenuItem.java: Added Javadoc.
(getSelectedObjects): Implemented.
* javax/swing/JRadioButtonMenuItem.java: Added Javadoc.
* javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java:
Added javadoc for few methods.
(processMouseEvent): Made public.
* javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
(processMouseEvent): Likewise.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/AbstractButton.java:
(init): Set display mnemonic index to -1.
(setMnemonic(char)): Use setMnemonic(int).
(setMnemonic(int)): Set display mnemonic index.
(getDisplayedMnemonicIndex): Change method signature
by removing 'index' parameter.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Added default for Menu.selectionBackground.
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(paintMenuItem): Change background color of the selected
menu item.
(paintText): Paint differently when menu item is disabled.
Also paint mnemonic if it appears in the menu item's label.
(paintAccelerator): Paint accelerator differently
if menu item is disabled.
* javax/swing/plaf/basic/BasicMenuUI.java:
(installDefaults): Install defaults for
selectionForeground and selectionBackground.
(uninstallDefaults): Uninstall defauls for
selectionForeground and selectionBackground.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(BranchElement): Implemented.
(LeafElement): Implemented.
* javax/swing/text/DefaultCaret.java:
Import used classes.
(serialVersionUID): New constant.
* javax/swing/text/JTextComponent.java
(AccessibleJTextComponent): Removed dead declaration.
(caretPos): Removed.
(setCaret): New method.
* javax/swing/text/PlainDocument.java
(rootElement): New field.
(PlainDocument): Initialize rootElement.
(createDefaultRoot): New method.
(getDefaultRootElement): Implemented.
* javax/swing/text/View.java: Reformatted.
* javax/swing/text/ViewFactory.java
(create): Added javadoc.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/ToolTipManager.java: Reformatted.
2004-07-21 Rodimina Olga <rodimina@redhat.com>
* javax/swing/AbstractButton.java
(changeEvent): New field.
(fireItemStateChanged): Change source of the event
to 'this' before firing it to button listeners.
(fireActionPerformed): Likewise.
(fireStateChanged): Likewise.
(createActionListener): Do not set source
of the event to AbstractButton.
* javax/swing/plaf/basic/BasicMenuBarUI.java:
(ContainerHandler.componentAdded): Removed
print out statement.
(ContainerHandler.componentRemoved): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/Highlighter.java: New file.
* Makefile.am: Added javax/swing/text/Highlighter.java.
* Makefile.in: Regenerated.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/ToolTipManager.java
(stillInsideTimerAction): Fixed constructor arguments.
(outsideTimerAction): Likewise.
(insideTimerAction): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JButton.java: Reformatted.
* javax/swing/JFormattedTextField.java
(getUIClassID): Implemented.
* javax/swing/JRootPane.java
(serialVersionUID): New constant.
* javax/swing/JTextField.java
(align): New field.
(JTextField): Simplified.
(getUIClassID): New method.
(getActionListeners): Added @since tag.
(setColumns): Invalidate layout and repaint.
(getHorizontalAlignment): New method.
(setHorizontalAlignment): New method.
(selectAll): Removed.
* javax/swing/SwingUtilities.java
(getAncestorOfClass): Removed redundant @see tag.
(isLeftMouseButton): Fixed implementation.
(isMiddleMouseButton): Likewise.
(isRightMouseButton): Likewise.
* javax/swing/text/AbstractDocument.java
(AttributeContext.addAttribute): New method.
(AttributeContext.addAttributes): New method.
(AttributeContext.getEmptySet): New method.
(AttributeContext.reclaim): New method.
(AttributeContext.removeAttribute): New method.
(AttributeContext.removeAttributes): New method.
* javax/swing/text/Document.java
(createPosition): Throws BadLocationException.
(getText): Likewise.
(remove): Likewise.
* javax/swing/text/JTextComponent.java
(getText): Return null if no document is set. Catch
BadLocationException.
(getUI): Return ui.
(updateUI): Simplified.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JButton.java
(removeNotify): Fixed javadoc.
(updateUI): Simplified.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/image/ImageDecoder.java
(startProduction): Only add consumer if it's not added yet.
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
(GdkPixbufDecoder): Don't call initState() here.
(produce): Call initState() here, to ensure area_prepared and
area_updated signals are properly connected.
* gnu/java/awt/peer/gtk/GtkImage.java
(setColorModel): Use equals() to compare ColorModel objects.
(setPixels): Likewise.
* java/awt/image/ColorModel.java
(equals): Fix typo. Use Arrays.equals() to compare int arrays.
* java/awt/image/RGBImageFilter.java
(setColorModel): Set consumer's color model.
(setPixels): Use equals() to compare ColorModel objects.
From-SVN: r85051
2004-07-22 15:36:05 +00:00
|
|
|
+ ",name=" + getFontName ()
|
2003-12-31 08:58:31 +00:00
|
|
|
+ ",style=" + getStyle ()
|
[multiple changes]
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JTextArea.java
(setLineWrap): Fire property change event after new value is set.
(setTabSize): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JTable.java
(autoCreateColumnsFromModel): New field.
(autoResizeMode): Likewise.
(cellEditor): Likewise.
(cellSelectionEnabled): Likewise.
(columnModel): Likewise.
(dataModel): Likewise.
(defaultEditorsByColumnClass): Likewise.
(defaultRenderersByColumnClass): Likewise.
(editingColumn): Likewise.
(editingRow): Likewise.
(gridColor): Likewise.
(preferredViewportSize): Likewise.
(rowHeight): Likewise.
(rowMargin): Likewise.
(rowSelectionAllowed): Likewise.
(selectionBackground): Likewise.
(selectionForeground): Likewise.
(selectionModel): Likewise.
(showHorizontalLines): Likewise.
(showVerticalLines): Likewise.
(tableHeader): Likewise.
(JTable): Implemented.
(getColumnModel): Likewise.
(getSelectedRow): Likewise.
(getSelectionModel): Likewise.
(setModel): Likewise.
(setSelectionModel): Likewise.
(createScrollPaneForTable): New method.
(createDefaultDataModel): Likewise.
(createDefaultListSelectionModel): Likewise.
(getModel): Likewise.
(getTableHeader): Likewise.
(setTableHeader): Likewise.
(getColumnSelectionAllowed): Likewise.
(setColumnSelectionAllowed): Likewise.
(getRowSelectionAllowed): Likewise.
(setRowSelectionAllowed): Likewise.
(getAutoResizeMode): Likewise.
(setAutoResizeMode): Likewise.
(getColumnCount): Likewise.
(getRowCount): Likewise.
(getCellRenderer): Likewise.
* javax/swing/JTree.java
(cellRenderer): New field.
(editable): Likewise.
(rootVisible): Likewise.
(showsRootHandles): Likewise.
(getModel): New method.
(setModel): Likewise.
(isEditable): Likewise.
(setEditable): Likewise.
(isRootVisbile): Likewise.
(setRootVisible): Likewise.
(getShowsRootHandles): Likewise.
(setShowRootHandles): Likewise.
(getCellRenderer): Likewise.
(setCellRenderer): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JFormattedTextField.java
(setDocument): Implemented.
* javax/swing/JRootPane.java:
Fixed javadocs.
* javax/swing/JTable.java
(getDefaultRenderer): New method.
* javax/swing/JTextField.java
(setFont): Likewise.
(getPreferredSize): Likewise.
* javax/swing/JToggleButton.java
(getAccessibleContext): Fix javadoc.
* javax/swing/JTree.java:
Add some javadocs.
* javax/swing/JViewport.java:
Likewise.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java:
Collect all native method declaration at the top.
(create): Set the filename filter if necessary.
(setDirectory): Call nativeSetDirectory().
(setFilenameFilter): Implement.
(filenameFilterCallback): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
(create): Configure dialog to show hidden files.
(filenameFilterCallback): New function.
(nativeSetFilenameFilter): New function.
(nativeSetDirectory): New function.
2004-07-21 Kim Ho <kho@redhat.com>
* javax/swing/plaf/basic/BasicSliderUI.java:
Ran Jalopy.
(paintTrack): Fill the track before painting
the borders.
2004-07-21 Graydon Hoare <graydon@redhat.com>
patch from Roman Kennke <roman@ontographics.com>
* javax/swing/Spring.java: New file.
* javax/swing/SpringLayout.java: New file.
* Makefile.am: Add new files.
* Makefile.in: Regenerate.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* javax/swing/plaf/basic/BasicSplitPaneUI.java: Minor layout fixes.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java: Likewise.
* javax/swing/ScrollPaneLayout.java: Likewise.
2004-07-21 Kim Ho <kho@redhat.com>
* javax/swing/DefaultDesktopManager.java:
(findMinimum): Removed.
(resizeFrame): Trust the UI to pass valid
bounds.
* javax/swing/JOptionPane.java:
Implemented showInternalXXXDialog methods.
(startModal): New method.
* javax/swing/plaf/basic/BasicInternalFrameUI.java:
(BorderListener::mouseDragged): Verify that the new
bounds are valid before passing them to the DesktopManager.
(preferredLayoutSize): Delegate
to getSize.
(minimumLayoutSize): Ditto.
(getSize): New method.
(GlassPaneDispatcher): Reimplemented by copying
a stripped down LightweightDispatcher from Container.
(getMinimumSize): Call minimumLayoutSize.
* javax/swing/plaf/basic/BasicOptionPaneUI.java:
Ran Jalopy.
(mousePressed): Add ability to properly close
JInternalFrames.
* javax/swing/plaf/basic/BasicToolBarUI.java:
(DragWindow): Set owner for DragWindow.
2004-07-21 Jerry Quinn <jlquinn@optonline.net>
* java/awt/image/ShortLookupTable.java: New file.
* java/awt/image/ByteLookupTable.java: New file.
* Makefile.am: Added new files.
* Makefile.in: Regenerated.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
(create(GtkContainerPeer)): New native method.
(create()): Call native create(), passing in the parent frame
as the paramter. Natively set the current file and directory.
(setFile): Construct an absolute filename before passing it to
the native peer.
(nativeGetDirectory): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
(window_closed): Removed.
(ok_clicked): Likewise.
(cancel_clicked): Likewise.
(handle_response): New method.
(create): Use GtkFileChooserDialog.
(connectSignals): Connect to handle_response.
(nativeGetDirectory): New method.
(nativeSetFile): Use GtkFileChooserDialog.
2004-07-21 Jerry Quinn <jlquinn@optonline.net>
* java/awt/image/LookupTable.java: New file.
* Makefile.am: Added new file.
* Makefile.in: Regenerated.
2004-07-21 Jerry Quinn <jlquinn@optonline.net>
* java/awt/image/Kernel.java: New file.
* Makefile.am: Added new file.
* Makefile.in: Regenerated.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JCheckBoxMenuItem.java: Fixed Javadocs.
* javax/swing/JMenu.java: Likewise.
* javax/swing/JMenuBar.java: Likewise.
(MARGIN_CHANGED_PROPERTY): New property.
(setMargin): Implemented.
* javax/swing/JMenuItem.java: Fixed javadocs.
* javax/swing/JPopupMenuUI.java: Fixed javadocs.
(LABEL_CHANGED_PROPERTY): New property.
(add): changed to use createActionComponent.
(createActionComponent): Implemented.
(setLabel): Fire PropertyChangeEvent if label property
changes.
* javax/swing/JRadioButtonMenuItem.java: Fixed javadocs.
* javax/swing/plaf/basic/BasicMenuBarUI.java: Likewise.
(ContainerHandler): Repaint if margin property has changed.
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(installUI): Call installComponents().
(uninstallUI): Call uinstallComponents().
* javax/swing/plaf/basic/BasicMenuUI.java:
Fixed javadocs.
* javax/swing/plaf/basic/BasicPopupMenuUI.java:
Likewise.
2004-07-21 Kim Ho <kho@redhat.com>
* javax/swing/plaf/basic/BasicToolBarUI.java:
(DragWindow): Use the right constructor.
2004-07-21 Kim Ho <kho@redhat.com>
* javax/swing/JToolBar.java:
(layoutContainer): Use getComponents.
* javax/swing/plaf/basic/BasicToolBarUI.java:
(DragWindow): Don't use SwingUtilities'
getOwnerFrame
(ToolBarDialog): ditto.
2004-07-21 Kim Ho <kho@redhat.com>
* javax/swing/JRootPane.java:
Ran jalopy.
(layoutContainer): Set the glasspane's size to
be the same as the content pane.
(createGlassPane): Set opaque property to false.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java (requestFocus()): Don't handle Panels
specially.
(requestFocus(boolean)): Likewise.
(requestFocusInWindow(boolean)): Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c (create):
Set GTK_CAN_FOCUS flag.
2004-07-21 Kim Ho <kho@redhat.com>
* Makefile.am: Added new file.
* Makefile.in: Regenerated.
* gcj/Makefile.in: Regenerated.
* include/Makefile.in: Regenerated.
* javax/swing/AbstractButton.java:
Add rollOverEnabled property.
(setRolloverEnabled): Use new property.
(isRolloverEnabled): Use new property.
* javax/swing/JTabbedPane.java:
(setComponent): Remove useless JTabbedPane.this.
* javax/swing/JToolBar.java: Finish implementation.
* javax/swing/plaf/basic/BasicArrowButton.java:
(paint): Moved border painting to a border.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Change JToolBar look and feel defaults.
* javax/swing/plaf/basic/BasicOptionPaneUI.java
(actionPerformed): Return Integer index instead of name.
(addButtonComponents): Check to see if component is
JButton last.
(createMessageArea): Don't use components that are not
completed yet.
(getIconForType): Use temporary icons.
* javax/swing/plaf/basic/BasicSliderUI.java:
(mousePressed): Do not return if it's on thumb.
(paintMinorTickForHorizSlider): Use BLACK to paint ticks.
(paintMinorTickForVertSlider): ditto.
(paintMajorTickForHorizSlider): ditto.
(paintMajorTickForVertSlider): ditto.
* javax/swing/plaf/basic/BasicSplitPaneDivider.java:
Add a border around the SplitPaneDivider.
* javax/swing/plaf/basic/BasicSplitPaneUI.java:
Remove comments.
* javax/swing/plaf/basic/BasicToolBarSeparatorUI.java:
New file. Implemented.
* javax/swing/plaf/basic/BasicToolBarUI.java:
Implemented.
* testsuite/Makefile.in: Regenerated.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* javax/swing/Timer.java (run): Queue events each time cycle.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkImagePainter.java
(imageComplete): Call image.imageComplete().
* java/awt/image/MemoryImageSource.java:
Reimplement consumers as a Vector instead of a Hashtable. This is
because enumeration on a Hashtable is not thread-safe.
(addConsumer): Adapt to Vector consumers.
(isConsumer): Adapt to Vector consumers.
(removeConsumer): Adapt to Vector consumers.
(startProduction): Adapt to Vector consumers. Call imageComplete()
with STATICIMAGEDONE flag instead of SINGLEFRAME flag.
(newPixels): Adapt to Vector consumers.
(sendPicture): Set the color model of the image consumer.
(newPixels(IIII)): Adapt to Vector consumers.
(newPixels(IIIIB)): Adapt to Vector consumers.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java (deliverEvent): Implement.
(postEvent): Implement.
(handleEvent): Implement.
(translateEvent): New method.
(dispatchEventImpl): Document. Add AWT 1.0 event handling.
* java/awt/Container.java (deliverEvent): Implement.
* java/awt/Event.java (paramString): Fix formatting.
* java/awt/Font.java (toString): Likewise.
* java/awt/Window.java (postEvent): Implement.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/DefaultKeyboardFocusManager.java (dispatchEvent):
Set window's focus owner upon receiving a FOCUS_LOST event.
* java/awt/Window.java (Window()): Refocus the previously
focused component within the window when the window regains the
top-level focus.
(setFocusOwner): New method.
* java/awt/Component.java (requestFocus): Add FIXME.
* libgcj.pc.in: Remove library flags.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkPanelPeer.java (handleEvent): Handle
MOUSE_PRESSED event.
* java/awt/Component.java (requestFocus()): Handle Panel
specially. Post FOCUS_LOST event on opposite component.
(requestFocus(boolean)): Likewise.
(requestFocusInWindow(boolean)): Likewise.
(paramString): Reorder dimension fields.
* java/awt/Container.java (paramString): Fix string format.
* java/awt/DefaultKeyboardFocusManager.java (dispatchEvent):
Handle FOCUS_LOST events. Don't handle Windows specially. Only
process key events if the focus owner is non-null.
(dispatchKeyEvent): Likewise.
* java/awt/Frame.java (paramString): Fix formatting.
(generateName): New method.
(getUniqueLong): Likewise.
* java/awt/KeyboardFocusManager.java (getFocusOwner): Check if
the temporary focus owner is null. If so, return the permanent
focus owner.
* java/awt/Panel.java (generateName): New method.
(getUniqueLong): Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Rework
signal handling to make callbacks more specific.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/Position.java
(Bias): Implemented.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/LookAndFeel.java
(provideErrorFeedback): New method.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JTextArea.java
(tabSize): New field.
(getTabSize): New method.
(setTabSize): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/ActionMap.java:
Fixed javadocs all over.
(serialVersionUID): Made private.
(parent): Don't explicitely initialize with default value.
(get): SImplified.
(keys): Reimplemented.
(allKeys): Likewise.
(convertSet): Removed.
* javax/swing/ComponentInputMap.java:
Fixed javadocs all over.
(ComponentInputMap): Implemented.
(put): Likewise.
(clear): Likewise.
(remove): Likewise.
(SetParent): Likewise.
(getComponent): Likewise.
* javax/swing/InputMap.java:
Fixed javadocs all over.
(serialVersionUID): Made private.
(parent): Don't explicitely initialize with default value.
(get): SImplified.
(keys): Reimplemented.
(allKeys): Likewise.
(convertSet): Removed.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/ActionMap.java,
javax/swing/ComponentInputMap.java,
javax/swing/InputMap.java,
javax/swing/table/DefaultTableColumnModel.java,
javax/swing/table/TableColumn.java,
javax/swing/table/TableColumnModel.java,
javax/swing/table/TableModel.java,
javax/swing/text/AbstractDocument.java,
javax/swing/text/TextAction.java:
Reformated.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GtkToolkit.java (bufferedImageOrError):
Make method non-static.
* javax/swing/AbstractButton.java:
Rename fields to match property names where possible.
(iconTextGap): New property.
* javax/swing/JCheckBox.java: Match AbstractButton changes.
(init) New method, call from after various constructors.
* javax/swing/JComponent.java (revalidate):
Invalidate before queueing repair.
* javax/swing/JList.java (getPreferredScrollableViewportSize):
Reimplement in terms of visibleRowCount property.
* javax/swing/JMenuButton.java: Match AbstractButton changes.
* javax/swing/JScrollPane.java (createScrollListener):
Remove tracing chatter.
* javax/swing/JToggleButton.java: Match AbstractButton changes.
* javax/swing/RepaintManager.java (addInvalidComponent):
Don't invalidate.
* javax/swing/ScrollPaneLayout.java: Various corrections to layout
calculations.
* javax/swing/SwingUtilities.java (layoutCompoundLabel):
Mimic sun behavior on top left/right positioning.
* javax/swing/ViewportLayout.java (preferredLayoutSize):
Remove mistaken use of preferredScrollableViewportSize here.
(layoutContainer): Use view's preferred size as basis.
* javax/swing/plaf/basic/BasicButtonUI.java:
Set, get, and use textIconGap property.
(paint) Paint text returned from layout (with ellipsis).
* javax/swing/plaf/basic/BasicListUI.java:
Remove tracing chatter, correct various minor calculations.
(getCellBounds): Update layout state before calculating.
* javax/swing/plaf/basic/BasicLookAndFeel.java (Button.Margin):
Use margin default similar to sun's.
* javax/swing/plaf/basic/BasicScrollBarUI.java (ArrowIcon):
(createIncreaseIcon): Center icon, minimize margins.
(createDecreaseIcon): Likewise.
* javax/swing/plaf/basic/BasicScrollPaneUI.java (installDefaults):
Implement.
(installUI): Call it.
(uninstallDefaults): Implement.
(uninstallUI): Call it.
* javax/swing/plaf/basic/BasicToolBarUI.java (DragWindow):
Call existing Window constructor.
* javax/swing/plaf/basic/BasicViewportUI.java (paint):
Set clip before painting.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JMenuItem.java:
(processMouseEvent): Reimplemented to deal with
mouse drag events.
(createMenuDragMouseEvent): New private helper method.
Creates MenuDragMouseEvent.
* javax/swing/MenuSelectionManager.java
(componentForPoint): Implemented.
(isComponentPartOfCurrentMenu): Made public.
(processMouseEvent): Reimplemented to deal with
mouse drag events.
(setSelectedPath): Corrected small mistake that caused
path to be set incorrectly.
(getPath): If given component is JMenu then also add this
menu's popup menu to the selected path.
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(getPath): Ditto.
(getPreferredSize): Call getPreferredMenuItemSize().
(getPreferredItemSize): Moved code from getPreferredSize to here.
(installListeners): Install MouseMotionListeners.
(MouseInputHandler): Pass mouse release event to MenuSelectionManager
if mouse wasn't released in the bounds of this menu item.
(MenuDragMouseHandler): Implemented.
* javax/swing/plaf/basic/BasicMenuUI.java:
(installListeners): Install MouseMotionListener and
MenuDrageMouseListener.
(MenuDragMouseHandler): Implemented.
* javax/swing/plaf/basic/BasicPopupMenuUI.java:
(uninstallListeners): Implemented.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JCheckBox.java: Reformated.
(JCheckBox): Fixed all constructors.
(isBorderPaintedFlat): New method.
(setBorderPaintedFlat): New method.
* javax/swing/JEditorPane.java
(createEditorKitForContentType): Made public.
(scrollToReference): Likewise.
* javax/swing/JTextArea.java
(setLineWrap): Fire property change.
* javax/swing/JToggleButton.java
(JToggleButton): New constructor.
(JToggleButton): Simplified.
* javax/swing/text/AttributeSet.java
(FontAttribute): Renamed from FontCharacterAttribute.
* javax/swing/text/JTextComponent.java
(KeyBinBinding): Added javadoc.
(JTextComponent): Likewise.
(getAccessibleContext): Fixed javadoc.
* javax/swing/text/View.java
(View): Added javadoc.
* javax/swing/text/TabableView.java: New file.
* Makefile.am: Added javax/swing/text/TabableView.java.
* Makefile.in: Regenerated.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* java/awt/image/BufferedImage.java (getSource): Remove tracing chatter.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(GtkErrorImage): New helper class.
(bufferedImageOrError): New helper method.
(createImage): Use it.
2004-07-21 David Jee <djee@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
(setCaretPosition): Scroll the text view so the new caret position
is visible on screen.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setBounds): Do not validate awtComponent here.
* gnu/java/awt/peer/gtk/GtkScrollPanePeer.java
(getPreferredSize): New method.
* java/awt/ScrollPane.java
(ScrollPane): Set default size to 100x100.
(addNotify): If child is not a Panel, wrap it with a new Panel.
(paramString): Implement.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JMenu.java:
(setSelected): Display popup menu only if this menu
is showing on the screen.
* javax/swing/JPopupMenu.java:
(processMouseEvent): Added comment.
(processKeyEvent): Likewise.
* javax/swing/MenuSelectionManager.java:
(clearSelectedPath): Only fireStateChanged() after
selected path was changed, not before.
(setSelectedPath): Likewise.
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(paintMenuItem): Corrected position of menu item's
icon.
* javax/swing/plaf/basic/BasicPopupMenuUI.java:
(installUI): Correct setDefaultLightWeightPopupEnabled call.
(popupMenuCanceled): Reimplemented.
(popupMenuWillBecomeVisible): Select first menu item by default
when displaying free floating popup menus.
(TopWindowListener): Reimplemented.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Panel.java (dispatchEventImpl): Override to prevent
Panel from being painted twice when it is first shown.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* java/awt/Window.java: Reverted changes from my
previous patch for creating window without an owner.
* javax/swing/SwingUtilities.java:
(SwingUtilities.OwnerFrame): made static.
(OwnerFrame.setVisible): New method. Overridden with
empty implementation.
(OwnerFrame.isShowing): New method. Ovverridden
to return always true.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(GtkComponentPeer): Remove temporary try/catch block.
(setVisible): Call show and hide.
(show): Make native.
(hide): Likewise.
(getArgs): Don't add "visible" argument.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(property_notify_predicate): Return Bool instead of int.
(find_layout): New function.
(connectJObject): Call find_layout.
(connectSignals): Likewise.
(moveLayout): Likewise.
(gtkLayoutSetVisible): Likewise.
2004-07-21 Mark Wielaard <mark@klomp.org>
* java/awt/event/InvocationEvent.java (dispatch): Synchronize
on notifier object before calling notifyAll().
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* java/awt/Window.java: Changed constructors to use new
method that is described below. Constructors call this
methods only if newly created window should have an owner.
(setWindowOwner): New method. Implementation for
this method is moved from this(owner,configuration).
* javax/swing/JWindow.java:
(JWindow): Reimplement to use SwingUtilities.ownerFrame
instead of owner.
* javax/swing/SwingUtilities.java:
(ownerFrame): Change type of this field to OwnerFrame.
(getOwnerFrame): Changed to return object of type OwnerFrame.
(SwingUtilities.OwnerFrame): New class. Represents owner
of a Window that is not provided with one.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/AbstractButton.java:
(configurePropertiesFromAction): Set action command
to button's text by default if action command is not
explicitely specified.
* javax/swing/JMenu.java: Remove unnecessary listener
and methods relevant to it.
(setSelected): Reimplemented.
(menuSelectionChanged): Moved most part of implementation to
setSelected() and call it instead.
* javax/swing/JMenuItem.java:
(init): Comment out statement that sets paint_border to false.
(configurePropertiesFromAction): Do not set accelerator
for JMenu.
(menuSelectionChanged): Change selected index in the selection
model of menu item's parent.
* javax/swing/JPopupMenu.java:
(remove): Set constraints.fill field to GridBagConstraints.BOTH
instead of GridBagConstraints.HORIZONTAL.
(insert): Likewise.
(createActionChangeListener): Implemented.
(setVisible): Correct location of HeavyWeightMenu and
don't firePopupMenuCanceled().
(menuSelectionChanged): Implemented.
(ActionChangeListener): New Listener. Implemented.
* javax/swing/plaf/basic/BasicMenuBarUI.java:
(BasicMenuBarUI.ContainerHandler): Implemented.
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(paintMenuItem): Uncommented out code that paints
icon, now that icons are working properly.
(PropertyChangeListener): Implemented.
* javax/swing/plaf/basic/BasicPopupMenuUI.java:
Added javadocs.
(topWindowListener): New field.
(Constructor): initialize topWindowListener.
(BasicPopupMenuUI.TopWindowListener): Implemented.
(BasicPopupMenuUI.PopupMenuHandler): Implemented.
(BasicPopupMenuUI.TopWindowListener): New ComponentListener.
Implemented.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicButtonUI.java
(paintFocus): Fixed method signature.
(paintButtonPressed): Likewise.
(paintButtonNormal): Likewise.
(paintText): New method.
* javax/swing/plaf/basic/BasicLabelUI.java
(paint): Re-indented.
* javax/swing/plaf/basic/BasicTextUI.java
(installUI): Set parent textComponent to opaque.
* javax/swing/text/DefaultHighlighter.java
(checkPositions): New helper method.
(addHighlight): Throws BadLocationException, check positions.
(changeHighlight): Likewise.
* javax/swing/text/EditorKit.java
(EditorKit): Implements Serializable.
* javax/swing/text/JTextComponent.java
(getUI): Added javadoc.
(setUI): Likewise.
(upadteUI): Added javadoc, don't revalidate and repaint.
2004-07-21 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(ArrangeGrid): Use PREFERREDSIZE instead of MINSIZE.
* javax/swing/AbstractButton.java
(setText): Reindent.
* javax/swing/RepaintManager.java
(addInvalidComponent): Find the first ancestor that isValidateRoot().
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JFormattedTextField.java
(value): New field.
(JFormattedTextField): Implemented.
(getValue): Likewise.
(setValue): Likewise.
* javax/swing/LookAndFeel.java
(getSupportsWindowDecorations): New method.
* javax/swing/UIDefaults.java:
Use java.beans.PropertyChangeSupport instead of doing all ourself.
(addPropertyChangeListener): Made public.
(addResourceBundle): Likewise.
(removeResourceBundle): Likewise.
(setDefaultLocale): Likewise.
* javax/swing/plaf/basic/BasicRootPaneUI.java
(BasicRootPaneUI): Implements PropertyChangeListener.
(propertyChange): New method.
* javax/swing/plaf/basic/BasicTextUI.java
(BasicHighlighter): New inner class.
(createHighlighter): New method.
* javax/swing/plaf/basic/BasicToolBarUI.java
(DragWindow): Extends java.awt.Window.
* javax/swing/text/JTextComponent.java
(getDocument): Removed debug output.
* javax/swing/plaf/basic/BasicTextFieldUI.java,
javax/swing/text/DefaultHighlighter.java,
javax/swing/text/FieldView.java,
javax/swing/text/PlainView.java: New files.
* Makefile.am: Added new files.
* Makefile.in: Regenerated.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JEditorPane.java
(createDefaultEditorKit): Use javax.swing.text.DefaultEditorKit.
(createEditorKitForContentType): Likewise.
* javax/swing/text/DefaultEditorKit.java
(serialVersionUID): Added constant field.
(EndOfLineStringPropery): Fixed typo.
(DefaultEditorKit): New constructor.
* javax/swing/text/Segment.java:
Import java.text.CharacterIterator.
* javax/swing/text/CharacterIterator.java,
javax/swing/text/PlainEditorKit.java: Removed.
* Makefile.am: Removed javax/swing/text/CharacterIterator.java and
javax/swing/text/PlainEditorKit.java.
* Makefile.in: Regenerated.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JButton.java,
javax/swing/text/DefaultEditorKit.java,
javax/swing/text/EditorKit.java,
javax/swing/text/Segment.java,
javax/swing/text/StyledEditorKit.java:
Reformatted.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/ImageIcon.java
(file): Removed.
(description): Renamed from descr.
(ImageIcon): Added missing constructors.
(setParent): Removed.
(setImageObserver): New method.
(getImageObserver): New method.
(paintIcon): Handle observer = null.
* javax/swing/JButton.java
(removeNotify): Fixed javadoc.
(updateUI): Simplified.
* javax/swing/JRootPane.java
(serialVersionUID): New constant field.
* javax/swing/UIManager.java:
Fixed javadocs all over.
(setLookAndFeel): Throws UnsupportedLookAndFeelException.
* javax/swing/text/AbstractDocument.java
(createPosition): Throws BadLocationException.
(getText): Likewise.
(remove): Likewise.
* javax/swing/text/ComponentView.java
(modelToView): Likewise.
* javax/swing/text/DefaultEditorKit.java:
Made all public methods public.
(read): Throws BadLocationException and IOException.
(write): Likewise.
* javax/swing/text/EditorKit.java:
Made all public methods public.
(serialVersionUID): New constant field.
(clone): New method.
(read): Throws BadLocationException and IOException.
(write): Likewise.
* javax/swing/text/Segment.java
(array): Made public.
(count): Likewise.
(offset): Likewise.
(Segment): New constructors.
(clone): Reimplemented.
* javax/swing/text/StyledEditorKit.java
(serialVersionUID): New constant field.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* java/awt/image/BufferedImage.java
(getSource): Implement.
* javax/swing/ImageIcon.java
(ImageIcon): Implement ctor.
* javax/swing/ScrollPaneLayout.java
(preferredLayoutSize): Be more careful about nulls.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AttributeSet.java
(CharacterAttribute): New interface
(ColorAttribute): Likewise.
(FontCharacterAttribute): Likewise.
(ParagraphAttribute): Likewise.
* javax/swing/text/DefaultCaret.java
(moveCaret): New method.
(positionCaret): Likewise.
(repaint): Made protected.
* javax/swing/text/JTextComponent.java
(KeyBinding): Made it static.
* javax/swing/text/View.java
(getContainer): Honor parent == null.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java:
Reformatted.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicRootPaneUI.java:
Import javax.swing.UIManager explicitely.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java
(ScrollingButton): Made it static.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/UIDefaults.java
(ActiveValue): Made public.
(LazyValue): Likewise.
* javax/swing/plaf/basic/BasicTextUI.java
(RootView): Reintroduced.
(view): Removed.
(rootView): New field.
(installUI): Create document if needed, initialize rootView.
(uninstallUI): Hanle rootView.
(paint): Likewise.
(getRootView): Likewise.
(setView): Likewise.
* javax/swing/text/DefaultCaret.java:
Renamed all "evt" variables to "event".
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* libgcj.spec.in: Add -l-java-util-logging.
2004-07-21 Andreas Tobler <a.tobler@schweiz.ch>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
(init_dpi_conversion_factor): Check for int_dpi < 0 in case
gtk-xft-dpi can no calculate the right value.
(dpi_changed_cb): Mark *pspec as unsused.
2004-07-21 David Jee <djee@redhat.com>
* java/awt/Component.java
(move): Delegate to setBounds().
(resize): Likewise.
(reshape): Fix so it repaints parent and self only when necessary.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(GtkComponentPeer): Revert previous patch from 2004-06-22.
(setVisible): Likewise.
(show): Likewise.
(hide): Likewise.
(getArgs): Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(property_notify_predicate): Likewise.
(find_layout): Likewise.
(connectJObject): Likewise.
(connectSignals): Likewise.
(moveLayout): Likewise.
(gtkLayoutSetVisible): Likewise.
2004-07-21 Graydon Hoare <graydon@redhat.com>
* Makefile.am
(jv_convert_LDADD):
(gij_LDADD):
(rmic_LDADD):
(rmiregistry_LDADD): Add lib-java-util-logging.la
* Makefile.in: Regenerate.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(replace): Dont use protected method of java.util.Vector directly.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(installUI): Call specialized install methods.
(installDefaults): New method.
(installListeners): Likewise.
(installKeyboardActions): Likewise.
(uninstallUI): Likewise.
(uninstallDefaults): New method.
(uninstallListeners): Likewise.
(uninstallKeyboardActions): Likewise.
(getPropertyPrefix): New abstract method.
(paint): Made final, just call paintSafely().
(paintSavely): New method.
(paintBackground): Likewise.
(getVisibleEditorRect): Likewise.
* javax/swing/text/LayeredHighlighter.java,
javax/swing/text/TabExpander.java: New files.
* Makefile.am: Added javax/swing/text/LayeredHighlighter.java
and javax/swing/text/TabExpander.java.
* Makefile.in: Regenerated.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(BasicTextUI): Made abstract.
(BasicCaret): New inner class.
(view): Don't explicitely initialize with "null".
(textComponent): New field.
(textColor): Removed.
(disabledTextColor): Removed.
(normalBackgroundColor): Removed.
(RootView): Removed commented out inner class.
(createUI): Removed.
(createCaret): New method.
(getComponent): Likewise.
(installUI): Initialize textComponent only.
(getPreferredSize): Use installed JTextComponent.
(setView): New method.
(create): Likewise.
* javax/swing/text/JTextComponent.java
(highlighter): New field.
(caretColor): Likewise.
(disabledTextColor): Likewise.
(seletedTextColor): Likewise.
(selectionColor): Likewise.
(setUI): New method.
(getCaretColor): Likewise.
(setCaretColor): Likewise.
(getDisabledColor): Likewise.
(setDisabledColor): Likewise.
(getSelectedTextColor): Likewise.
(setSelectedTextColor): Likewise.
(getSelectionColor): Likewise.
(setSelectionColor): Likewise.
(getHighlighter): Likewise.
(setHighlighter): Likewise.
(replaceSelection): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicScrollPaneUI.java
(BasicScrollPaneUI): Implements ScrollPaneConstants.
* javax/swing/plaf/basic/BasicToolBarUI.java
(BasicToolBarUI): Implements SwingConstants.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JPopupMenu.java: Removed CVS tags.
* javax/swing/UIDefaults.java: Reformatted.
* javax/swing/plaf/basic/BasicRootPaneUI.java:
Explicitely import used classes.
2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(GtkComponentPeer): Remove temporary try/catch block.
(setVisible): Call show and hide.
(show): Make native.
(hide): Likewise.
(getArgs): Don't add "visible" argument.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(property_notify_predicate): Return Bool instead of int.
(find_layout): New function.
(connectJObject): Call find_layout.
(connectSignals): Likewise.
(moveLayout): Likewise.
(gtkLayoutSetVisible): Likewise.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/AbstractButton.java:
(setDisplayedMnemonicIndex): Check if button
text is not null before checking its length.
* javax/swing/JMenuItem.java:
(processMouseEvent): Disarm menu item if mouse has
exited it.
* javax/swing/plaf/basic/BasicMenuUI.java:
(MouseInputHandler.mouseEntered): Do not raise
popup menu if this menu is already selected.
(MouseInputHandler.mousePressed): Do not fire
MenuEvents.
(MenuHandler): Implemented.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JCheckBoxMenuItem.java: Added Javadoc.
(getSelectedObjects): Implemented.
* javax/swing/JRadioButtonMenuItem.java: Added Javadoc.
* javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java:
Added javadoc for few methods.
(processMouseEvent): Made public.
* javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
(processMouseEvent): Likewise.
2004-07-21 Olga Rodimina <rodimina@redhat.com>
* javax/swing/AbstractButton.java:
(init): Set display mnemonic index to -1.
(setMnemonic(char)): Use setMnemonic(int).
(setMnemonic(int)): Set display mnemonic index.
(getDisplayedMnemonicIndex): Change method signature
by removing 'index' parameter.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Added default for Menu.selectionBackground.
* javax/swing/plaf/basic/BasicMenuItemUI.java:
(paintMenuItem): Change background color of the selected
menu item.
(paintText): Paint differently when menu item is disabled.
Also paint mnemonic if it appears in the menu item's label.
(paintAccelerator): Paint accelerator differently
if menu item is disabled.
* javax/swing/plaf/basic/BasicMenuUI.java:
(installDefaults): Install defaults for
selectionForeground and selectionBackground.
(uninstallDefaults): Uninstall defauls for
selectionForeground and selectionBackground.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(BranchElement): Implemented.
(LeafElement): Implemented.
* javax/swing/text/DefaultCaret.java:
Import used classes.
(serialVersionUID): New constant.
* javax/swing/text/JTextComponent.java
(AccessibleJTextComponent): Removed dead declaration.
(caretPos): Removed.
(setCaret): New method.
* javax/swing/text/PlainDocument.java
(rootElement): New field.
(PlainDocument): Initialize rootElement.
(createDefaultRoot): New method.
(getDefaultRootElement): Implemented.
* javax/swing/text/View.java: Reformatted.
* javax/swing/text/ViewFactory.java
(create): Added javadoc.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/ToolTipManager.java: Reformatted.
2004-07-21 Rodimina Olga <rodimina@redhat.com>
* javax/swing/AbstractButton.java
(changeEvent): New field.
(fireItemStateChanged): Change source of the event
to 'this' before firing it to button listeners.
(fireActionPerformed): Likewise.
(fireStateChanged): Likewise.
(createActionListener): Do not set source
of the event to AbstractButton.
* javax/swing/plaf/basic/BasicMenuBarUI.java:
(ContainerHandler.componentAdded): Removed
print out statement.
(ContainerHandler.componentRemoved): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/text/Highlighter.java: New file.
* Makefile.am: Added javax/swing/text/Highlighter.java.
* Makefile.in: Regenerated.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/ToolTipManager.java
(stillInsideTimerAction): Fixed constructor arguments.
(outsideTimerAction): Likewise.
(insideTimerAction): Likewise.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JButton.java: Reformatted.
* javax/swing/JFormattedTextField.java
(getUIClassID): Implemented.
* javax/swing/JRootPane.java
(serialVersionUID): New constant.
* javax/swing/JTextField.java
(align): New field.
(JTextField): Simplified.
(getUIClassID): New method.
(getActionListeners): Added @since tag.
(setColumns): Invalidate layout and repaint.
(getHorizontalAlignment): New method.
(setHorizontalAlignment): New method.
(selectAll): Removed.
* javax/swing/SwingUtilities.java
(getAncestorOfClass): Removed redundant @see tag.
(isLeftMouseButton): Fixed implementation.
(isMiddleMouseButton): Likewise.
(isRightMouseButton): Likewise.
* javax/swing/text/AbstractDocument.java
(AttributeContext.addAttribute): New method.
(AttributeContext.addAttributes): New method.
(AttributeContext.getEmptySet): New method.
(AttributeContext.reclaim): New method.
(AttributeContext.removeAttribute): New method.
(AttributeContext.removeAttributes): New method.
* javax/swing/text/Document.java
(createPosition): Throws BadLocationException.
(getText): Likewise.
(remove): Likewise.
* javax/swing/text/JTextComponent.java
(getText): Return null if no document is set. Catch
BadLocationException.
(getUI): Return ui.
(updateUI): Simplified.
2004-07-21 Michael Koch <konqueror@gmx.de>
* javax/swing/JButton.java
(removeNotify): Fixed javadoc.
(updateUI): Simplified.
2004-07-21 David Jee <djee@redhat.com>
* gnu/java/awt/image/ImageDecoder.java
(startProduction): Only add consumer if it's not added yet.
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
(GdkPixbufDecoder): Don't call initState() here.
(produce): Call initState() here, to ensure area_prepared and
area_updated signals are properly connected.
* gnu/java/awt/peer/gtk/GtkImage.java
(setColorModel): Use equals() to compare ColorModel objects.
(setPixels): Likewise.
* java/awt/image/ColorModel.java
(equals): Fix typo. Use Arrays.equals() to compare int arrays.
* java/awt/image/RGBImageFilter.java
(setColorModel): Set consumer's color model.
(setPixels): Use equals() to compare ColorModel objects.
From-SVN: r85051
2004-07-22 15:36:05 +00:00
|
|
|
+ ",size=" + getSize ());
|
2002-01-22 22:03:04 +00:00
|
|
|
}
|
|
|
|
|
Font.java [...]: New versions from classpath.
2003-06-19 Michael Koch <konqueror@gmx.de>
* java/awt/Font.java
javax/swing/UIManager.java
javax/swing/border/AbstractBorder.java
javax/swing/border/BevelBorder.java
javax/swing/border/Border.java
javax/swing/border/CompoundBorder.java
javax/swing/border/EmptyBorder.java
javax/swing/border/EtchedBorder.java
javax/swing/border/LineBorder.java
javax/swing/border/MatteBorder.java
javax/swing/border/TitledBorder.java
javax/swing/plaf/BorderUIResource.java
javax/swing/plaf/basic/BasicBorders.java
javax/swing/plaf/basic/BasicButtonUI.java
javax/swing/plaf/basic/BasicCheckBoxUI.java
javax/swing/plaf/basic/BasicGraphicsUtils.java
javax/swing/plaf/basic/BasicLabelUI.java
javax/swing/plaf/basic/BasicRadioButtonUI.java
javax/swing/plaf/basic/BasicToggleButtonUI.java:
New versions from classpath.
* javax/swing/border/SoftBevelBorder.java:
New file from classpath.
* javax/swing/border/doc-files/LineBorder-1.png,
javax/swing/border/doc-files/BevelBorder-1.png,
javax/swing/border/doc-files/BevelBorder-2.png,
javax/swing/border/doc-files/BevelBorder-3.png,
javax/swing/border/doc-files/EmptyBorder-1.png,
javax/swing/border/doc-files/EtchedBorder-1.png,
javax/swing/border/doc-files/EtchedBorder-2.png,
javax/swing/border/doc-files/MatteBorder-1.png,
javax/swing/border/doc-files/MatteBorder-2.png,
javax/swing/border/doc-files/MatteBorder-3.png,
javax/swing/border/doc-files/MatteBorder-4.png,
javax/swing/border/doc-files/MatteBorder-5.png,
javax/swing/border/doc-files/MatteBorder-6.png,
javax/swing/border/doc-files/SoftBevelBorder-1.png,
javax/swing/border/doc-files/SoftBevelBorder-2.png,
javax/swing/border/doc-files/SoftBevelBorder-3.png,
javax/swing/plaf/basic/doc-files/BasicBorders.MarginBorder-1.png,
javax/swing/plaf/basic/doc-files/BasicBorders.ButtonBorder-1.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-1.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-2.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-3.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-4.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-5.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-6.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-7.png:
New binary files from classpath.
* Makefile.am
(awt_java_source_files): Added
javax/swing/border/SoftBevelBorder.java.
* Makefile.in: Regenerated.
From-SVN: r68190
2003-06-19 10:48:46 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines the line metrics for a run of text.
|
|
|
|
*
|
|
|
|
* @param str the text run to be measured.
|
|
|
|
*
|
|
|
|
* @param frc the font rendering parameters that are used for the
|
|
|
|
* measurement. The exact placement and size of text slightly
|
|
|
|
* depends on device-specific characteristics, for instance
|
|
|
|
* the device resolution or anti-aliasing. For this reason,
|
|
|
|
* the returned measurement will only be accurate if the
|
|
|
|
* passed <code>FontRenderContext</code> correctly reflects
|
|
|
|
* the relevant parameters. Hence, <code>frc</code> should be
|
|
|
|
* obtained from the same <code>Graphics2D</code> that will
|
|
|
|
* be used for drawing, and any rendering hints should be set
|
|
|
|
* to the desired values before obtaining <code>frc</code>.
|
|
|
|
*
|
|
|
|
* @see java.awt.Graphics2D#getFontRenderContext()
|
|
|
|
*/
|
|
|
|
public LineMetrics getLineMetrics(String str, FontRenderContext frc)
|
|
|
|
{
|
2003-12-31 08:58:31 +00:00
|
|
|
return getLineMetrics (str, 0, str.length () - 1, frc);
|
Font.java [...]: New versions from classpath.
2003-06-19 Michael Koch <konqueror@gmx.de>
* java/awt/Font.java
javax/swing/UIManager.java
javax/swing/border/AbstractBorder.java
javax/swing/border/BevelBorder.java
javax/swing/border/Border.java
javax/swing/border/CompoundBorder.java
javax/swing/border/EmptyBorder.java
javax/swing/border/EtchedBorder.java
javax/swing/border/LineBorder.java
javax/swing/border/MatteBorder.java
javax/swing/border/TitledBorder.java
javax/swing/plaf/BorderUIResource.java
javax/swing/plaf/basic/BasicBorders.java
javax/swing/plaf/basic/BasicButtonUI.java
javax/swing/plaf/basic/BasicCheckBoxUI.java
javax/swing/plaf/basic/BasicGraphicsUtils.java
javax/swing/plaf/basic/BasicLabelUI.java
javax/swing/plaf/basic/BasicRadioButtonUI.java
javax/swing/plaf/basic/BasicToggleButtonUI.java:
New versions from classpath.
* javax/swing/border/SoftBevelBorder.java:
New file from classpath.
* javax/swing/border/doc-files/LineBorder-1.png,
javax/swing/border/doc-files/BevelBorder-1.png,
javax/swing/border/doc-files/BevelBorder-2.png,
javax/swing/border/doc-files/BevelBorder-3.png,
javax/swing/border/doc-files/EmptyBorder-1.png,
javax/swing/border/doc-files/EtchedBorder-1.png,
javax/swing/border/doc-files/EtchedBorder-2.png,
javax/swing/border/doc-files/MatteBorder-1.png,
javax/swing/border/doc-files/MatteBorder-2.png,
javax/swing/border/doc-files/MatteBorder-3.png,
javax/swing/border/doc-files/MatteBorder-4.png,
javax/swing/border/doc-files/MatteBorder-5.png,
javax/swing/border/doc-files/MatteBorder-6.png,
javax/swing/border/doc-files/SoftBevelBorder-1.png,
javax/swing/border/doc-files/SoftBevelBorder-2.png,
javax/swing/border/doc-files/SoftBevelBorder-3.png,
javax/swing/plaf/basic/doc-files/BasicBorders.MarginBorder-1.png,
javax/swing/plaf/basic/doc-files/BasicBorders.ButtonBorder-1.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-1.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-2.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-3.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-4.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-5.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-6.png,
javax/swing/plaf/basic/doc-files/BasicGraphicsUtils-7.png:
New binary files from classpath.
* Makefile.am
(awt_java_source_files): Added
javax/swing/border/SoftBevelBorder.java.
* Makefile.in: Regenerated.
From-SVN: r68190
2003-06-19 10:48:46 +00:00
|
|
|
}
|
2003-12-31 08:58:31 +00:00
|
|
|
|
2002-01-22 22:03:04 +00:00
|
|
|
} // class Font
|
|
|
|
|