31e632d3e4
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
349 lines
7.8 KiB
Java
349 lines
7.8 KiB
Java
/* AttributedStringIterator.java -- Class to iterate over AttributedString
|
|
Copyright (C) 1998, 1999 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 java.text;
|
|
|
|
import java.util.Set;
|
|
import java.util.HashSet;
|
|
import java.util.Map;
|
|
import java.util.HashMap;
|
|
import java.util.Iterator;
|
|
|
|
/**
|
|
* This class implements the AttributedCharacterIterator interface. It
|
|
* is used by AttributedString.getIterator().
|
|
*
|
|
* @version 0.0
|
|
*
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
*/
|
|
class AttributedStringIterator implements AttributedCharacterIterator
|
|
{
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Instance Variables
|
|
*/
|
|
|
|
/**
|
|
* The character iterator containing the text
|
|
*/
|
|
private CharacterIterator ci;
|
|
|
|
/**
|
|
* The list of attributes and ranges
|
|
*/
|
|
private AttributedString.AttributeRange[] attribs;
|
|
|
|
/**
|
|
* The list of attributes that the user is interested in. We may,
|
|
* at our option, not return any other attributes.
|
|
*/
|
|
private AttributedCharacterIterator.Attribute[] restricts;
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Constructors
|
|
*/
|
|
|
|
AttributedStringIterator(StringCharacterIterator sci,
|
|
AttributedString.AttributeRange[] attribs,
|
|
int begin_index, int end_index,
|
|
AttributedCharacterIterator.Attribute[] restricts)
|
|
{
|
|
this.ci = new StringCharacterIterator(sci, begin_index, end_index);
|
|
this.attribs = attribs;
|
|
this.restricts = restricts;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Instance Methods
|
|
*/
|
|
|
|
// First we have a bunch of stupid redirects. If StringCharacterIterator
|
|
// weren't final, I just would have extended that for this class. Alas, no.
|
|
|
|
public Object
|
|
clone()
|
|
{
|
|
return(ci.clone());
|
|
}
|
|
|
|
public char
|
|
current()
|
|
{
|
|
return(ci.current());
|
|
}
|
|
|
|
public char
|
|
next()
|
|
{
|
|
return(ci.next());
|
|
}
|
|
|
|
public char
|
|
previous()
|
|
{
|
|
return(ci.previous());
|
|
}
|
|
|
|
public char
|
|
first()
|
|
{
|
|
return(ci.first());
|
|
}
|
|
|
|
public char
|
|
last()
|
|
{
|
|
return(ci.last());
|
|
}
|
|
|
|
public int
|
|
getIndex()
|
|
{
|
|
return(ci.getIndex());
|
|
}
|
|
|
|
public char
|
|
setIndex(int index)
|
|
{
|
|
return(ci.setIndex(index));
|
|
}
|
|
|
|
public int
|
|
getBeginIndex()
|
|
{
|
|
return(ci.getBeginIndex());
|
|
}
|
|
|
|
public int
|
|
getEndIndex()
|
|
{
|
|
return(ci.getEndIndex());
|
|
}
|
|
|
|
/*
|
|
* Here is where the AttributedCharacterIterator methods start.
|
|
*/
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns a list of all the attribute keys that are defined anywhere
|
|
* on this string.
|
|
*/
|
|
public Set
|
|
getAllAttributeKeys()
|
|
{
|
|
HashSet s = new HashSet();
|
|
if (attribs == null)
|
|
return(s);
|
|
|
|
for (int i = 0; i < attribs.length; i++)
|
|
{
|
|
if (attribs[i].begin_index > getEndIndex()
|
|
|| attribs[i].end_index <= getBeginIndex())
|
|
continue;
|
|
|
|
Set key_set = attribs[i].attribs.keySet();
|
|
Iterator iter = key_set.iterator();
|
|
while (iter.hasNext())
|
|
{
|
|
s.add(iter.next());
|
|
}
|
|
}
|
|
|
|
return(s);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Various methods that determine how far the run extends for various
|
|
* attribute combinations.
|
|
*/
|
|
|
|
public int
|
|
getRunLimit()
|
|
{
|
|
return(getRunLimit(getAttributes().keySet()));
|
|
}
|
|
|
|
public int
|
|
getRunLimit(AttributedCharacterIterator.Attribute attrib)
|
|
{
|
|
HashSet s = new HashSet();
|
|
s.add(attrib);
|
|
|
|
return(getRunLimit(s));
|
|
}
|
|
|
|
public synchronized int
|
|
getRunLimit(Set attribute_set)
|
|
{
|
|
boolean hit = false;
|
|
int runLimit = ci.getEndIndex ();
|
|
int pos = ci.getIndex ();
|
|
|
|
for (int i = 0; i < attribs.length; ++i)
|
|
{
|
|
if (pos >= attribs[i].begin_index &&
|
|
pos <= attribs[i].end_index)
|
|
{
|
|
Iterator iter = attribute_set.iterator();
|
|
while(iter.hasNext())
|
|
if (attribs[i].attribs.containsKey(iter.next()))
|
|
{
|
|
hit = true;
|
|
runLimit = Math.min(runLimit, attribs[i].end_index);
|
|
}
|
|
}
|
|
}
|
|
if (hit)
|
|
return runLimit;
|
|
else
|
|
return -1;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Various methods that determine where the run begins for various
|
|
* attribute combinations.
|
|
*/
|
|
|
|
public int
|
|
getRunStart()
|
|
{
|
|
return(getRunStart(getAttributes().keySet()));
|
|
}
|
|
|
|
public int
|
|
getRunStart(AttributedCharacterIterator.Attribute attrib)
|
|
{
|
|
HashSet s = new HashSet();
|
|
s.add(attrib);
|
|
|
|
return(getRunStart(s));
|
|
}
|
|
|
|
public int
|
|
getRunStart(Set attribute_set)
|
|
{
|
|
boolean hit = false;
|
|
int runBegin = 0;
|
|
int pos = ci.getIndex ();
|
|
|
|
for (int i = 0; i < attribs.length; ++i)
|
|
{
|
|
if (pos >= attribs[i].begin_index &&
|
|
pos <= attribs[i].end_index)
|
|
{
|
|
Iterator iter = attribute_set.iterator();
|
|
while(iter.hasNext())
|
|
if (attribs[i].attribs.containsKey(iter.next()))
|
|
{
|
|
hit = true;
|
|
runBegin = Math.max(runBegin, attribs[i].begin_index);
|
|
}
|
|
}
|
|
}
|
|
if (hit)
|
|
return runBegin;
|
|
else
|
|
return -1;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
public Object
|
|
getAttribute(AttributedCharacterIterator.Attribute attrib)
|
|
{
|
|
if (attribs == null)
|
|
return(null);
|
|
|
|
for (int i = 0; i < attribs.length; i++)
|
|
{
|
|
Set key_set = attribs[i].attribs.keySet();
|
|
Iterator iter = key_set.iterator();
|
|
while (iter.hasNext())
|
|
{
|
|
Object obj = iter.next();
|
|
|
|
// Check for attribute match and range match
|
|
if (obj.equals(attrib))
|
|
if ((ci.getIndex() >= attribs[i].begin_index) &&
|
|
(ci.getIndex() < attribs[i].end_index))
|
|
return(attribs[i].attribs.get(obj));
|
|
}
|
|
}
|
|
|
|
return(null);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Return a list of all the attributes and values defined for this
|
|
* character
|
|
*/
|
|
public Map
|
|
getAttributes()
|
|
{
|
|
HashMap m = new HashMap();
|
|
if (attribs == null)
|
|
return(m);
|
|
|
|
for (int i = 0; i < attribs.length; i++)
|
|
{
|
|
if ((ci.getIndex() >= attribs[i].begin_index) &&
|
|
(ci.getIndex() < attribs[i].end_index))
|
|
m.putAll(attribs[i].attribs);
|
|
}
|
|
|
|
return(m);
|
|
}
|
|
|
|
} // class AttributedStringIterator
|
|
|