From 31e632d3e47f22d310f36709f6d983cb1a8dba92 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Fri, 16 Apr 2004 18:44:45 +0000 Subject: [multiple changes] 2004-04-09 Thomas Fitzsimmons * 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 * 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 * 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 * 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 * javax/swing/plaf/basic/BasicMenuItemUI.java: Corrected position of the accelerator. 2004-03-29 Olga Rodimina * 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 * 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 * 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 * 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 * 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 * javax/swing/plaf/basic/BasicTabbedPaneUI.java: (calculateSizes): Return real width and height. 2004-03-23 Kim Ho * javax/swing/plaf/basic/BasicTabbedPaneUI.java (calculateTabRects): Set the selectedRun before trying to rotate tabs. 2004-03-23 Kim Ho * 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 * 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 * 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 * java/applet/Applet.java (preferredSize): Override deprecated variant of getPreferredSize. (minimumSize): Override deprecated variant of getMinimumSize. 2004-03-15 Olga Rodimina * 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 * java/applet/Applet.java (dimensions): New field. (getDimensions): New method. (getPreferredSize): Call getDimensions. (getMinimumSize): Likewise. 2004-03-13 Thomas Fitzsimmons * 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 --- libjava/java/applet/Applet.java | 40 +++++++++++ libjava/java/awt/Component.java | 6 ++ libjava/java/awt/Graphics.java | 2 +- libjava/java/awt/Menu.java | 7 +- libjava/java/awt/MenuItem.java | 5 +- libjava/java/awt/PopupMenu.java | 4 +- libjava/java/awt/peer/MenuPeer.java | 1 - libjava/java/text/AttributedString.java | 29 ++------ libjava/java/text/AttributedStringIterator.java | 94 ++++++++++--------------- 9 files changed, 100 insertions(+), 88 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/applet/Applet.java b/libjava/java/applet/Applet.java index 5990c63..27c8aaf 100644 --- a/libjava/java/applet/Applet.java +++ b/libjava/java/applet/Applet.java @@ -78,6 +78,11 @@ public class Applet extends Panel private transient AppletStub stub; /** + * The dimensions passed to this applet through its HTML tag. + */ + private transient Dimension dimensions; + + /** * The accessibility context for this applet. * * @serial the accessibleContext for this @@ -457,6 +462,41 @@ public class Applet extends Panel s.defaultReadObject(); } + private Dimension getDimensions () + { + if (dimensions == null) + { + int width = Integer.parseInt(stub.getParameter("width")); + int height = Integer.parseInt(stub.getParameter("height")); + + dimensions = new Dimension(width, height); + } + + return dimensions; + } + + /** + * Returns an instance of {@link Dimension} representing the + * applet's width and height parameters. + * + * @return the applet's preferred size + */ + public Dimension preferredSize() + { + return getDimensions (); + } + + /** + * Returns an instance of {@link Dimension} representing the + * applet's width and height parameters. + * + * @return the applet's minimum size + */ + public Dimension minimumSize() + { + return getDimensions (); + } + /** * This class provides accessibility support for Applets, and is the * runtime type returned by {@link #getAccessibleContext()}. diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java index 8c75ba0..bfd4e08 100644 --- a/libjava/java/awt/Component.java +++ b/libjava/java/awt/Component.java @@ -3816,6 +3816,12 @@ public abstract class Component if (popups == null) popups = new Vector(); popups.add(popup); + + if (popup.parent != null) + popup.parent.remove(popup); + popup.parent = this; + if (peer != null) + popup.addNotify(); } /** diff --git a/libjava/java/awt/Graphics.java b/libjava/java/awt/Graphics.java index c225b52..0d551b2 100644 --- a/libjava/java/awt/Graphics.java +++ b/libjava/java/awt/Graphics.java @@ -417,7 +417,7 @@ draw3DRect(int x, int y, int width, int height, boolean raised) drawLine(x1, y2, x1, y1); setColor(br); drawLine(x2, y1, x2, y2); - drawLine(x2, y1, x1, y2); + drawLine(x2, y2, x1, y2); setColor(color); } diff --git a/libjava/java/awt/Menu.java b/libjava/java/awt/Menu.java index 74478fb..c6c4f21 100644 --- a/libjava/java/awt/Menu.java +++ b/libjava/java/awt/Menu.java @@ -82,7 +82,7 @@ private boolean isHelpMenu; // From the serialization spec. FIXME: what should it be? private int menuSerializedDataVersion; -static final MenuItem separator = new MenuItem("-"); +static final String separatorLabel = "-"; /*************************************************************************/ @@ -295,8 +295,7 @@ insert(String label, int index) public void addSeparator() { - if (peer != null) - ((MenuPeer) peer).addSeparator(); + add(new MenuItem(separatorLabel)); } /*************************************************************************/ @@ -314,7 +313,7 @@ addSeparator() public void insertSeparator(int index) { - insert(separator, index); + insert(new MenuItem(separatorLabel), index); } /*************************************************************************/ diff --git a/libjava/java/awt/MenuItem.java b/libjava/java/awt/MenuItem.java index cfdfafc..4defc38 100644 --- a/libjava/java/awt/MenuItem.java +++ b/libjava/java/awt/MenuItem.java @@ -310,7 +310,10 @@ deleteShortcut() public String getActionCommand() { - return(actionCommand); + if (actionCommand == null) + return label; + else + return actionCommand; } /*************************************************************************/ diff --git a/libjava/java/awt/PopupMenu.java b/libjava/java/awt/PopupMenu.java index cde79e3..83ffb35 100644 --- a/libjava/java/awt/PopupMenu.java +++ b/libjava/java/awt/PopupMenu.java @@ -105,7 +105,7 @@ PopupMenu(String label) public void addNotify() { - if (peer != null) + if (peer == null) peer = getToolkit ().createPopupMenu (this); super.addNotify (); } @@ -123,6 +123,8 @@ addNotify() public void show(Component component, int x, int y) { + if (getPeer() == null) + this.addNotify(); PopupMenuPeer pmp = (PopupMenuPeer)getPeer(); if (pmp != null) { diff --git a/libjava/java/awt/peer/MenuPeer.java b/libjava/java/awt/peer/MenuPeer.java index 67f213f..0b15914 100644 --- a/libjava/java/awt/peer/MenuPeer.java +++ b/libjava/java/awt/peer/MenuPeer.java @@ -43,7 +43,6 @@ import java.awt.MenuItem; public interface MenuPeer extends MenuItemPeer { void addItem (MenuItem item); - void addSeparator (); void delItem (int index); } diff --git a/libjava/java/text/AttributedString.java b/libjava/java/text/AttributedString.java index a8eede8..46cbf92 100644 --- a/libjava/java/text/AttributedString.java +++ b/libjava/java/text/AttributedString.java @@ -38,6 +38,7 @@ exception statement from your version. */ package java.text; +import java.util.Arrays; import java.util.Iterator; import java.util.HashMap; import java.util.Hashtable; @@ -219,26 +220,7 @@ AttributedString(AttributedCharacterIterator aci, int begin_index, // Get the valid attribute list Set all_attribs = aci.getAllAttributeKeys(); if (attributes != null) - { - Set valid_attribs = new HashSet(); - Iterator iter = all_attribs.iterator(); - while (iter.hasNext()) - { - Object obj = iter.next(); - - int i; - for (i = 0; i < attributes.length; i++) - if (obj.equals(attributes[0])) - break; - - if (i == attributes.length) - continue; - - valid_attribs.add(obj); - } - - all_attribs = valid_attribs; - } + all_attribs.retainAll(Arrays.asList(attributes)); // Loop through and extract the attributes char c = aci.setIndex(begin_index); @@ -320,7 +302,7 @@ AttributedString(AttributedCharacterIterator aci, int begin_index, public void addAttribute(AttributedCharacterIterator.Attribute attrib, Object value) { - addAttribute(attrib, value, 0, sci.getEndIndex() - 1); + addAttribute(attrib, value, 0, sci.getEndIndex()); } /*************************************************************************/ @@ -389,8 +371,7 @@ addAttributes(Map attributes, int begin_index, int end_index) public AttributedCharacterIterator getIterator() { - return(new AttributedStringIterator(sci, attribs, 0, sci.getEndIndex() - 1, - null)); + return(new AttributedStringIterator(sci, attribs, 0, sci.getEndIndex(), null)); } /*************************************************************************/ @@ -409,7 +390,7 @@ getIterator() public AttributedCharacterIterator getIterator(AttributedCharacterIterator.Attribute[] attributes) { - return(getIterator(attributes, 0, sci.getEndIndex() - 1)); + return(getIterator(attributes, 0, sci.getEndIndex())); } /*************************************************************************/ diff --git a/libjava/java/text/AttributedStringIterator.java b/libjava/java/text/AttributedStringIterator.java index 77c5981..9820457 100644 --- a/libjava/java/text/AttributedStringIterator.java +++ b/libjava/java/text/AttributedStringIterator.java @@ -221,39 +221,28 @@ getRunLimit(AttributedCharacterIterator.Attribute attrib) public synchronized int getRunLimit(Set attribute_set) { - int orig_index = ci.getIndex(); - int run_limit; + boolean hit = false; + int runLimit = ci.getEndIndex (); + int pos = ci.getIndex (); - do + for (int i = 0; i < attribs.length; ++i) { - run_limit = ci.getIndex(); - - Map attribute_map = getAttributes(); - - boolean found = false; - Iterator iter = attribute_set.iterator(); - while(iter.hasNext()) - if (!attribute_map.containsKey(iter.next())) - { - found = true; - break; - } - - if (found) - break; + 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); + } + } } - while (ci.next() != CharacterIterator.DONE); - - boolean hit_end = (ci.previous() == CharacterIterator.DONE); - - ci.setIndex(orig_index); - - if (run_limit == orig_index) - return(-1); // No characters match the given attributes -// else if (!hit_end) -// --run_limit; - - return(run_limit); + if (hit) + return runLimit; + else + return -1; } /*************************************************************************/ @@ -281,35 +270,28 @@ getRunStart(AttributedCharacterIterator.Attribute attrib) public int getRunStart(Set attribute_set) { - int orig_index = ci.getIndex(); - int run_start; + boolean hit = false; + int runBegin = 0; + int pos = ci.getIndex (); - do + for (int i = 0; i < attribs.length; ++i) { - run_start = ci.getIndex(); - - Map attribute_map = getAttributes(); - - Iterator iter = attribute_set.iterator(); - while(iter.hasNext()) - if (!attribute_map.containsKey(iter.next())) - break; - - if (iter.hasNext()) - break; + 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); + } + } } - while (ci.previous() != CharacterIterator.DONE); - - boolean hit_beginning = (ci.previous() == CharacterIterator.DONE); - - ci.setIndex(orig_index); - - if (run_start == orig_index) - return(-1); // No characters match the given attributes - else if (!hit_beginning) - ++run_start; - - return(run_start); + if (hit) + return runBegin; + else + return -1; } /*************************************************************************/ -- cgit v1.1