FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[multiple changes]

Browse source 
2004-04-09  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkPanelPeer.java (connectSignals):
	Remove method.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c: Remove
	unused code.

2004-04-02  Olga Rodimina  <rodimina@redhat.com>

	* Makefile.am: Added new file.
	* Makefile.in: Regenerate.
	* javax/swing/ImageIcon.java:
	(ImageIcon(file)): set description of the icon
	to the file name
	* javax/swing/JCheckBoxMenuItem.java:
	Mostly Implemented. Work in progress.
	* javax/swing/JRadioButtonMenuItem.java:
 	Reimplement constructors to use JToggleButtonModel.
	* javax/swing/plaf/basic/BasicIconFactory.java:
	(getCheckBoxMenuItemIcon): return check box
	icon.
	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	paint menu item selected only when it is armed and
	pressed.

2004-04-02  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
	(GtkMenuItemPeer): Only connect signals if this isn't a Menu peer.
	* java/awt/Component.java
	(add): Set the parent of the popup as this component.
	* java/awt/PopupMenu.java
	(addNotify): Create popup menu when peer is null.
	(show): Call addNotify() if peer is null.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show): Set the button
	argument for gtk_menu_popup() as zero. This causes the popup menu to
	respond to any mouse button.

2004-03-31  Olga Rodimina  <rodimina@redhat.com>

	* Makefile.am: Added new file.
	* Makefile.in: Regenerate.
	* javax/swing/JRadioButtonMenuItem.java:
	Implemented.
	* javax/swing/plaf/basic/BasicIconFactory.java:
	(getRadioButtonMenuItemIcon): Return
	radio button icon.
	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	(getPreferredSize): Add size of checkIcon if it
	exists.
	(installDefaults): Don't initialize checkIcon.
	It's value will be set in subclasses.
	(uninstallDefaults): remove uninstallation of
	checkIcon.
	(paint): Moved code to paintMenuItem().
	(paintMenuItem): Implemented.
	* javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java:
	UI delegate for JRadioButtonMenuItem.

2004-03-29  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	Corrected position of the accelerator.

2004-03-29  Olga Rodimina  <rodimina@redhat.com>

	* Makefile.am: Added new file.
	* Makefile.in: Regenerate.
	* javax/swing/JMenuItem.java: Partly
	implemented. Work in progress
	* javax/swing/plaf/basic/BasicLookAndFeel.java:
	Changed default value of acceleratorDelimiter.
	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	New class. Partly implemented.

2004-03-26  Mark Wielaard  <mark@klomp.org>

	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
	(item_activate): Declare label before use.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(gtkSetFont): Removed unused variable label.
	(addExposeFilter): Declare variables before use.
	(removeExposeFilter): Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
	(ok_clicked): Declare str_fileName before use.

2004-03-26  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkMenuPeer.java
	(addSeparator): Remove.
	* java/awt/Menu.java
	(separator): Remove static final MenuItem field.
	(separatorLabel): New static final String field.
	(addSeparator): Do not use peer method; use add(MenuItem) instead.
	Use separatorLabel to denote that it is a separator.
	(insertSeparator): Create a new MenuItem with separatorLabel, instead
	of reusing the static separator instance, because a MenuItem instance
	can't be added more than once without being cloned.
	* java/awt/peer/MenuPeer.java
	(addSeparator): Remove from interface.

2004-03-26  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
	(connectSignals): New native method declaration.
	(GtkMenuItemPeer): Connect signals if the parent is a Menu.
	* java/awt/MenuItem.java
	(getActionCommand): Return the label if the action command is not set.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu): Use
	gtk_menu_shell_append().
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
	(item_activate): Fix argument type.
	(Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create): Do not connect
	signal here.
	(Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals): New
	method.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create): Check if a label is
	given. Add the menu widget's top-level GtkWindow to the global window
	group, so it can grab the pointer.
	(Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem): Use
	gtk_menu_shell_append().

2004-03-23  Graydon Hoare  <graydon@redhat.com>

	* java/text/AttributedString.java
	(addAttribute): Fix off-by-one.
	(getIterator): Likewise.
	* java/text/AttributedStringIterator.java
	(getRunLimit): Correct logic.
	(getRunStart): Likewise.
	(getAttribute): Fix inequality.
	(getAttributes): Likewise.
	* testsuite/libjava.mauve/xfails: Remove AttributedString xfail.

2004-03-23  Kim Ho  <kho@redhat.com>

	* javax/swing/plaf/basic/BasicTabbedPaneUI.java:
	(calculateSizes): Return real width and height.

2004-03-23  Kim Ho  <kho@redhat.com>

	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
	(calculateTabRects): Set the selectedRun before
	trying to rotate tabs.

2004-03-23  Kim Ho  <kho@redhat.com>

	* Makefile.am: New file
	* Makefile.in: Regenerate
	* java/awt/Graphics.java: (drawRect):
	Draw to the correct point.
	* javax/swing/DefaultSingleSelectionModel.java
	(isSelected): Return true if the selected index
	is not -1.
	* javax/swing/JLabel.java: Do not change mnemonic
	index if text is null.
	* javax/swing/JProgressBar.java: Use JComponent's
	EventListenerList.
	* javax/swing/JScrollBar.java: Ditto.
	* javax/swing/JSlider.java: Ditto.
	* javax/swing/JTabbedPane.java: Reimplement.
	* javax/swing/plaf/basic/BasicLookAndFeel.java:
	Add defaults for TabbedPane.
	* javax/swing/plaf/basic/BasicArrowButton.java:
	Implement
	* javax/swing/plaf/basic/BasicProgressBarUI.java:
	(paintDeterminate): Don't paint String if it's
	empty.
	(paintIndeterminate): ditto.
	* javax/swing/plaf/basic/BasicTabbedPaneUI.java:
	Reimplement.

2004-03-19  Michael Koch  <konqueror@gmx.de>

	* java/awt/image/AffineTransformOp.java
	(AffineTransformOp): Made public.
	* javax/swing/JComponent.java
	(listenerList): Made protected.
	(accessibleContext): Likewise.
	* javax/swing/JList.java
	(valueChanged): Dont use internal fields of ListSelectionEvent.
	* javax/swing/JViewport.java
	(getView): Dont use internal fields of Component.
	(addImpl): Likewise.
	* javax/swing/Timer.java
	(isRunning): Made public.
	(start): Likewise.
	(stop): Likewise.
	* javax/swing/UIDefaults.java
	(getInt): Made public.
	* javax/swing/plaf/basic/BasicListUI.java
	(mousePressed): Dont use internal fields of MouseEvent.
	(propertyChanged): Dont use internal fields of PropertyChangeEvent.
	* javax/swing/plaf/basic/BasicScrollBarUI.java
	(arrowIcon): Made static.
	* javax/swing/plaf/basic/BasicViewportUI.java
	(stateChanged): Dont use internal field on ChangeEvent.
	* javax/swing/text/JTextComponent.java
	(getUI): Call UIManager.getUI().
	(updateUI): Use getUI().

2004-03-19  Graydon Hoare  <graydon@redhat.com>

	* javax/swing/JComponent.java: Turn off double buffer by default.
	* javax/swing/plaf/basic/BasicViewportUI.java: Clear rects before painting.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
	(Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable):
	Use cairo to copy areas.
	(Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip):
	Initialize and set clip region.

2004-03-15  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* java/applet/Applet.java (preferredSize): Override deprecated
	variant of getPreferredSize.
	(minimumSize): Override deprecated variant of getMinimumSize.

2004-03-15  Olga Rodimina  <rodimina@redhat.com>

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java
	(drawImage(img,xform,bgcolor,obs)): New Method.
	Helper function that every drawImage method will
	use.
	(drawRaster): Added new parameter, bgcolor. All
	transparent pixels are changed to bgcolor before
	image is drawn.
	(drawRenderedImage): Fixed to use changed drawRaster().
	(drawImage(image,xform,obs): Fixed to use new helper function
	(drawImage(image,op,x,y)): Ditto.
	(drawImage (img,x,y,observer)): Ditto.
	((PainterThread) bgcolor): New Field.
	((PainterThread) (setPixels)): Changed all transparent pixels
	to bgcolor.
	(drawImage(img,x,y,width,height,bgcolor,observer)):
	Fixed FIXME - all the transparent pixels are
	changed to the specified bgcolor.
	(drawImage(img, x, y, width, height, observer): Changed to
	use function above.
	(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,bgcolor,observer)):
	Fixed FIXME- changed all transparent pixels to bgcolor.
	(drawImage (img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer)):
	Changed to use function above.

2004-03-14  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* java/applet/Applet.java (dimensions): New field.
	(getDimensions): New method.
	(getPreferredSize): Call getDimensions.
	(getMinimumSize): Likewise.

2004-03-13  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* jni/classpath/jcl.c: Include stdlib.h, not malloc.h.
	* jni/classpath/jnilink.c: Likewise.

	* java/applet/Applet.java (getPreferredSize): New method.
	(getMinimumSize): New method.

From-SVN: r80762
This commit is contained in:
Graydon Hoare 2004-04-16 18:44:45 +00:00
parent 2d49ce6797
commit 31e632d3e4
48 changed files with 6600 additions and 1142 deletions
Download patch file Download diff file Expand all files Collapse all files

363
libjava/javax/swing/plaf/basic/BasicArrowButton.java Normal file
View file

@ -0,0 +1,363 @@
/* BasicArrowButton.java
Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package javax.swing.plaf.basic;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Polygon;
import java.awt.Rectangle;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.SwingConstants;
/**
* This class draws simple arrow buttons for the Basic Look and Feel.
*/
public class BasicArrowButton extends JButton implements SwingConstants
{
/**
* A private helper class that draws icons.
*/
private class arrowIcon implements Icon
{
/** The polygon that describes the icon. */
private Polygon arrow;
/** The size of the icon. */
private int size = 10;
/**
* Creates a new arrowIcon object using the given arrow polygon.
*
* @param arrow The polygon that describes the arrow.
*/
public arrowIcon(Polygon arrow)
{
this.arrow = arrow;
}
/**
* Returns the height of the icon.
*
* @return The height of the icon.
*/
public int getIconHeight()
{
return size;
}
/**
* Returns the width of the icon.
*
* @return The width of the icon.
*/
public int getIconWidth()
{
return size;
}
/**
* Sets the size of the icon.
*
* @param size The size of the icon.
*/
public void setSize(int size)
{
this.size = size;
}
/**
* Sets the arrow polygon.
*
* @param arrow The arrow polygon.
*/
public void setArrow(Polygon arrow)
{
this.arrow = arrow;
}
/**
* Paints the icon.
*
* @param c The Component to paint for.
* @param g The Graphics object to draw with.
* @param x The X coordinate to draw at.
* @param y The Y coordinate to draw at.
*/
public void paintIcon(Component c, Graphics g, int x, int y)
{
Color arrowColor;
if (c.isEnabled())
arrowColor = darkShadow;
else
arrowColor = shadow;
paintIconImpl(g, x, y, arrowColor);
}
/**
* This method does the actual painting work.
*
* @param g The Graphics object to paint with.
* @param x The x coordinate to paint at.
* @param y The y coordinate to paint at.
* @param arrowColor The color to paint the arrow with.
*/
public void paintIconImpl(Graphics g, int x, int y, Color arrowColor)
{
g.translate(x, y);
Color saved = g.getColor();
g.setColor(arrowColor);
g.fillPolygon(arrow);
g.setColor(saved);
g.translate(-x, -y);
}
}
/** The direction to point in. */
protected int direction;
/** The color the arrow is painted in if disabled and the bottom and
* right edges of the button. */
private transient Color shadow = Color.BLACK;
/** The color the arrow is painted in if enabled and the bottom and
* right edges of the button. */
private transient Color darkShadow = Color.BLACK;
/** The top and left edges of the button. */
private transient Color highlight = Color.BLACK;
/**
* Creates a new BasicArrowButton object.
*
* @param direction The direction the arrow points in.
*/
public BasicArrowButton(int direction)
{
super();
setDirection(direction);
}
/**
* Creates a new BasicArrowButton object with the given colors and
* direction.
*
* @param direction The direction to point in.
* @param background The background color.
* @param shadow The shadow color.
* @param darkShadow The dark shadow color.
* @param highlight The highlight color.
*/
public BasicArrowButton(int direction, Color background, Color shadow,
Color darkShadow, Color highlight)
{
this(direction);
setBackground(background);
this.shadow = shadow;
this.darkShadow = darkShadow;
this.highlight = highlight;
}
/**
* This method returns the direction of the arrow.
*
* @return The direction of the arrow.
*/
public int getDirection()
{
return direction;
}
/**
* This method changes the direction of the arrow.
*
* @param dir The new direction of the arrow.
*/
public void setDirection(int dir)
{
Polygon arrow = getArrow(dir, 10);
if (getIcon() == null)
setIcon(new arrowIcon(arrow));
else
((arrowIcon) getIcon()).setArrow(arrow);
this.direction = direction;
}
/**
* This method paints the arrow button.
*
* @param g The Graphics object to paint with.
*/
public void paint(Graphics g)
{
super.paint(g);
Rectangle bounds = getBounds();
Color saved = g.getColor();
g.setColor(highlight);
g.drawLine(bounds.x, bounds.y, bounds.x, bounds.y + bounds.height);
g.drawLine(bounds.x, bounds.y, bounds.x + bounds.width, bounds.y);
g.setColor(shadow);
g.drawLine(bounds.x + 1, bounds.y + bounds.height - 1,
bounds.x + bounds.width - 1, bounds.y + bounds.height - 1);
g.drawLine(bounds.x + bounds.width - 1, bounds.y + 1,
bounds.x + bounds.width - 1, bounds.y + bounds.height - 1);
g.setColor(darkShadow);
g.drawLine(bounds.x, bounds.y + bounds.height, bounds.x + bounds.width,
bounds.y + bounds.height);
g.drawLine(bounds.x + bounds.width, bounds.y, bounds.x + bounds.width,
bounds.y + bounds.height);
g.setColor(saved);
}
/**
* This method returns the preferred size of the arrow button.
*
* @return The preferred size.
*/
public Dimension getPreferredSize()
{
return new Dimension(getIcon().getIconWidth(), getIcon().getIconHeight());
}
/**
* This method returns the minimum size of the arrow button.
*
* @return The minimum size.
*/
public Dimension getMinimumSize()
{
return getPreferredSize();
}
/**
* This method returns the maximum size of the arrow button.
*
* @return The maximum size.
*/
public Dimension getMaximumSize()
{
return getPreferredSize();
}
/**
* The method paints a triangle with the given size and direction at
* the given x and y coordinates.
*
* @param g The Graphics object to paint with.
* @param x The x coordinate to paint at.
* @param y The y coordinate to paint at.
* @param size The size of the icon.
* @param direction The direction of the icon.
* @param isEnabled Whether it is enabled.
*/
public void paintTriangle(Graphics g, int x, int y, int size, int direction,
boolean isEnabled)
{
Polygon arrow = getArrow(direction, size);
arrowIcon arrowI = new arrowIcon(arrow);
arrowI.setSize(size);
Color arrowColor;
if (isEnabled())
arrowColor = darkShadow;
else
arrowColor = shadow;
arrowI.paintIconImpl(g, x, y, arrowColor);
}
/**
* This is a private helper that creates polygons for a given size
* and direction.
*
* @param direction The direction of the arrow.
* @param size The size of the arrow.
*
* @return A new arrow polygon.
*/
private Polygon getArrow(int direction, int size)
{
Polygon arrow;
double dsize = (double) size;
int two = (int) (dsize * 2 / 10);
int three = (int) (dsize * 3 / 10);
int five = (int) (dsize * 5 / 10);
int seven = (int) (dsize * 7 / 10);
int eight = (int) (dsize * 8 / 10);
switch (direction)
{
case NORTH:
arrow = new Polygon(new int[] { two, five, eight },
new int[] { seven, three, seven }, 3);
break;
case SOUTH:
arrow = new Polygon(new int[] { two, five, eight },
new int[] { three, seven, three }, 3);
break;
case EAST:
case RIGHT:
arrow = new Polygon(new int[] { three, seven, three },
new int[] { two, five, eight }, 3);
break;
case WEST:
case LEFT:
arrow = new Polygon(new int[] { seven, three, seven },
new int[] { two, five, eight }, 3);
break;
default:
throw new IllegalArgumentException("Invalid direction given.");
}
return arrow;
}
}