[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing fixlet
PatchSet 6417 Date: 2005/04/24 12:36:55 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: swing fixlet 2005-04-24 Dalibor Topic [EMAIL PROTECTED] Resynced with GNU Classpath: 2005-04-23 Tom Tromey [EMAIL PROTECTED] * javax/swing/text/StyleConstants.java (StyleConstants): Now package-private. Members: ChangeLog:1.3945-1.3946 libraries/javalib/javax/swing/text/StyleConstants.java:1.3-1.4 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3945 kaffe/ChangeLog:1.3946 --- kaffe/ChangeLog:1.3945 Sun Apr 24 12:34:27 2005 +++ kaffe/ChangeLog Sun Apr 24 12:36:55 2005 @@ -2,6 +2,15 @@ Resynced with GNU Classpath: + 2005-04-23 Tom Tromey [EMAIL PROTECTED] + +* javax/swing/text/StyleConstants.java (StyleConstants): Now +package-private. + +2005-04-24 Dalibor Topic [EMAIL PROTECTED] + + Resynced with GNU Classpath: + 2005-04-23 Mark Wielaard [EMAIL PROTECTED] * java/net/URL.java (URL(URL,String,URLStreamHandler)): Add spec Index: kaffe/libraries/javalib/javax/swing/text/StyleConstants.java diff -u kaffe/libraries/javalib/javax/swing/text/StyleConstants.java:1.3 kaffe/libraries/javalib/javax/swing/text/StyleConstants.java:1.4 --- kaffe/libraries/javalib/javax/swing/text/StyleConstants.java:1.3Mon Oct 25 19:12:13 2004 +++ kaffe/libraries/javalib/javax/swing/text/StyleConstants.javaSun Apr 24 12:36:57 2005 @@ -1,5 +1,5 @@ /* StyleConstants.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,8 +83,10 @@ public static final Object ResolveAttribute = new StyleConstants(resolver); String keyname; - - private StyleConstants(String k) + + // Package-private to avoid accessor constructor for use by + // subclasses. + StyleConstants(String k) { keyname = k; } ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU classpath: swing fixlet
PatchSet 5612 Date: 2005/03/02 22:14:32 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU classpath: swing fixlet 2005-03-02 Dalibor Topic [EMAIL PROTECTED] Resynced with GNU Classpath. 2005-02-26 Roman Kennke [EMAIL PROTECTED] * javax/swing/plaf/basic/BasicListUI (updateLayoutState,paint): make BasicListUI aware of the width of the rendered JList Members: ChangeLog:1.3657-1.3658 libraries/javalib/javax/swing/plaf/basic/BasicListUI.java:1.4-1.5 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3657 kaffe/ChangeLog:1.3658 --- kaffe/ChangeLog:1.3657 Wed Mar 2 10:51:58 2005 +++ kaffe/ChangeLog Wed Mar 2 22:14:32 2005 @@ -2,6 +2,16 @@ Resynced with GNU Classpath. + 2005-02-26 Roman Kennke [EMAIL PROTECTED] + +* javax/swing/plaf/basic/BasicListUI +(updateLayoutState,paint): make BasicListUI aware of the +width of the rendered JList + +2005-03-02 Dalibor Topic [EMAIL PROTECTED] + + Resynced with GNU Classpath. + 2005-02-25 Sven de Marothy [EMAIL PROTECTED] * java/net/InetAddress.java Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicListUI.java diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicListUI.java:1.4 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicListUI.java:1.5 --- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicListUI.java:1.4 Sun Oct 24 13:39:19 2004 +++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicListUI.java Wed Mar 2 22:14:34 2005 @@ -44,6 +44,9 @@ import java.awt.Graphics; import java.awt.Point; import java.awt.Rectangle; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.event.ComponentListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.MouseEvent; @@ -71,6 +74,22 @@ */ public class BasicListUI extends ListUI { + + /** + * A helper class which listens for [EMAIL PROTECTED] ComponentEvent}s from + * the JList. + */ + class ComponentHandler extends ComponentAdapter { + +/** + * Called when the component is hidden. Invalidates the internal + * layout. + */ +public void componentResized(ComponentEvent ev) { + BasicListUI.this.damageLayout(); +} + } + /** * A helper class which listens for [EMAIL PROTECTED] FocusEvents} * from the JList. @@ -296,6 +315,10 @@ /** The property change listener listening to the list. */ PropertyChangeHandler propertyChangeListener; + /** The component listener that receives notification for resizing the + * JList component.*/ + ComponentListener componentListener; + /** Saved reference to the list this UI was created for. */ JList list; @@ -437,6 +460,7 @@ Dimension dim = flyweight.getPreferredSize(); cellHeights[i] = dim.height; cellWidth = Math.max(cellWidth, dim.width); +cellWidth = Math.max(cellWidth, list.getSize().width); } } else @@ -481,6 +505,7 @@ listSelectionListener = new ListSelectionHandler(); mouseInputListener = new MouseInputHandler(); propertyChangeListener = new PropertyChangeHandler(); +componentListener = new ComponentHandler(); updateLayoutStateNeeded = 1; } @@ -527,6 +552,7 @@ list.addMouseListener(mouseInputListener); list.addMouseMotionListener(mouseInputListener); list.addPropertyChangeListener(propertyChangeListener); +list.addComponentListener(componentListener); } /** ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing fixlet
PatchSet 5614 Date: 2005/03/02 22:27:38 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: swing fixlet 2005-03-02 Dalibor Topic [EMAIL PROTECTED] Resynced with GNU Classpath. 2005-02-26 Audrius Meskauskas [EMAIL PROTECTED] * javax/swing/Timer.java: documenting and some formatting. Members: ChangeLog:1.3659-1.3660 libraries/javalib/javax/swing/Timer.java:1.8-1.9 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3659 kaffe/ChangeLog:1.3660 --- kaffe/ChangeLog:1.3659 Wed Mar 2 22:26:39 2005 +++ kaffe/ChangeLog Wed Mar 2 22:27:38 2005 @@ -4,6 +4,15 @@ 2005-02-26 Audrius Meskauskas [EMAIL PROTECTED] +* javax/swing/Timer.java: documenting and some + formatting. + +2005-03-02 Dalibor Topic [EMAIL PROTECTED] + + Resynced with GNU Classpath. + + 2005-02-26 Audrius Meskauskas [EMAIL PROTECTED] + * javax/swing/JTextArea.java (replaceRange): Fixing doc.remove(start, length) misinterpretation. Index: kaffe/libraries/javalib/javax/swing/Timer.java diff -u kaffe/libraries/javalib/javax/swing/Timer.java:1.8 kaffe/libraries/javalib/javax/swing/Timer.java:1.9 --- kaffe/libraries/javalib/javax/swing/Timer.java:1.8 Wed Mar 2 10:30:01 2005 +++ kaffe/libraries/javalib/javax/swing/Timer.java Wed Mar 2 22:27:45 2005 @@ -1,5 +1,5 @@ /* Timer.java -- - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,33 +46,70 @@ import javax.swing.event.EventListenerList; /** - * DOCUMENT ME! + * Fires one or more action events after the specified delay. + * @author Ronald Veldema + * @author Audrius Meskauskas ([EMAIL PROTECTED]) - bug fixes + * and documentation comments */ -public class Timer implements Serializable +public class Timer + implements Serializable { - /** DOCUMENT ME! */ - private static final long serialVersionUID = -1116180831621385484L; - - /** DOCUMENT ME! */ - protected EventListenerList listenerList = new EventListenerList(); - - // This object manages a queue of virtual actionEvents, maintained as a - // simple long counter. When the timer expires, a new event is queued, - // and a dispatcher object is pushed into the system event queue. When - // the system thread runs the dispatcher, it will fire as many - // ActionEvents as have been queued, unless the timer is set to - // coalescing mode, in which case it will fire only one ActionEvent. + /** + * The timer thread + */ + private class Waker +extends Thread + { +/** + * Fires events, pausing for required intervals. + */ +public void run() +{ + running = true; + try +{ + sleep(initialDelay); - /** DOCUMENT ME! */ - private long queue; + queueEvent(); - /** DOCUMENT ME! */ - private Object queueLock = new Object(); + while (running) +{ + try +{ + sleep(delay); +} + catch (InterruptedException e) +{ + return; +} + queueEvent(); + + if (logTimers) +System.out.println(javax.swing.Timer - clocktick); + + if ( ! repeats) +break; +} + running = false; +} + catch (Exception e) +{ + // The timer is no longer running. + running = false; +} +} + } - /** DOCUMENT ME! */ - private Waker waker; + /** + * Use serialVersionUID for interoperability. + */ + private static final long serialVersionUID = -1116180831621385484L; - private Runnable drainer = new Runnable() + /** + * The encloding class, used with [EMAIL PROTECTED] SwingUtilities#invokeLater} + * to invoke the [EMAIL PROTECTED] #drainEvents()}. + */ + private Runnable drainer = new Runnable() { public void run() { @@ -81,105 +118,70 @@ }; /** - * DOCUMENT ME! + * If codetrue/code, the timer prints a message to + * [EMAIL PROTECTED] System#out} when firing each event. */ - private void queueEvent() - { -synchronized (queueLock) - { - queue++; - if (queue == 1) - SwingUtilities.invokeLater(drainer); - } - } + static boolean logTimers; /** - * DOCUMENT ME! + * A field to store all listeners who are listening to this timer. */ - private void drainEvents() - { -synchronized (queueLock) - { - if (isCoalesce()) - { - if (queue 0) - fireActionPerformed(); - } - else - { - while (queue 0) - { - fireActionPerformed(); - queue--; - } - } - queue = 0; - } - } - - static boolean logTimers; + protected
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing fixlet
PatchSet 5613 Date: 2005/03/02 22:26:39 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: swing fixlet 2005-03-02 Dalibor Topic [EMAIL PROTECTED] Resynced with GNU Classpath. 2005-02-26 Audrius Meskauskas [EMAIL PROTECTED] * javax/swing/JTextArea.java (replaceRange): Fixing doc.remove(start, length) misinterpretation. Members: ChangeLog:1.3658-1.3659 libraries/javalib/javax/swing/JTextArea.java:1.7-1.8 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3658 kaffe/ChangeLog:1.3659 --- kaffe/ChangeLog:1.3658 Wed Mar 2 22:14:32 2005 +++ kaffe/ChangeLog Wed Mar 2 22:26:39 2005 @@ -2,6 +2,15 @@ Resynced with GNU Classpath. + 2005-02-26 Audrius Meskauskas [EMAIL PROTECTED] + +* javax/swing/JTextArea.java (replaceRange): +Fixing doc.remove(start, length) misinterpretation. + +2005-03-02 Dalibor Topic [EMAIL PROTECTED] + + Resynced with GNU Classpath. + 2005-02-26 Roman Kennke [EMAIL PROTECTED] * javax/swing/plaf/basic/BasicListUI Index: kaffe/libraries/javalib/javax/swing/JTextArea.java diff -u kaffe/libraries/javalib/javax/swing/JTextArea.java:1.7 kaffe/libraries/javalib/javax/swing/JTextArea.java:1.8 --- kaffe/libraries/javalib/javax/swing/JTextArea.java:1.7 Sat Feb 19 15:14:18 2005 +++ kaffe/libraries/javalib/javax/swing/JTextArea.java Wed Mar 2 22:26:43 2005 @@ -469,12 +469,13 @@ try { - doc.remove(start, end); - doc.insertString(start, text, null); +doc.remove(start, end - start); +doc.insertString(start, text, null); } catch (BadLocationException e) { - // This cannot happen as we check offset above. +// This cannot happen as we check offset above. +throw new Error(Please report a bug, e); } } } ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath : swing fixlet
PatchSet 5489 Date: 2005/03/02 22:47:16 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath : swing fixlet 2005-03-02 Dalibor Topic [EMAIL PROTECTED] Resynced with GNU Classpath. 2005-02-27 Audrius Meskauskas [EMAIL PROTECTED] * javax/swing/JComboBox.java (constructors): selecting the first item if the box was constructed from the provided non - empty array or vector. Members: ChangeLog:1.3663-1.3664 libraries/javalib/javax/swing/JComboBox.java:1.6-1.7 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3663 kaffe/ChangeLog:1.3664 --- kaffe/ChangeLog:1.3663 Wed Mar 2 22:35:25 2005 +++ kaffe/ChangeLog Wed Mar 2 22:47:16 2005 @@ -2,6 +2,16 @@ Resynced with GNU Classpath. + 2005-02-27 Audrius Meskauskas [EMAIL PROTECTED] + +* javax/swing/JComboBox.java (constructors): selecting the +first item if the box was constructed from the provided +non - empty array or vector. + +2005-03-02 Dalibor Topic [EMAIL PROTECTED] + + Resynced with GNU Classpath. + 2005-02-27 Roman Kennke [EMAIL PROTECTED] * javax/swing/plaf/basic/BasicListUI: Index: kaffe/libraries/javalib/javax/swing/JComboBox.java diff -u kaffe/libraries/javalib/javax/swing/JComboBox.java:1.6 kaffe/libraries/javalib/javax/swing/JComboBox.java:1.7 --- kaffe/libraries/javalib/javax/swing/JComboBox.java:1.6 Thu Jan 27 14:07:11 2005 +++ kaffe/libraries/javalib/javax/swing/JComboBox.java Wed Mar 2 22:47:23 2005 @@ -185,6 +185,9 @@ public JComboBox(Object[] itemArray) { this(new DefaultComboBoxModel(itemArray)); + +if (itemArray.length 0) + setSelectedIndex(0); } /** @@ -195,6 +198,9 @@ public JComboBox(Vector itemVector) { this(new DefaultComboBoxModel(itemVector)); + +if (itemVector.size() 0) + setSelectedIndex(0); } /** ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing fixlet
PatchSet 5532 Date: 2005/02/13 22:33:37 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: swing fixlet 2005-02-13 Dalibor Topic [EMAIL PROTECTED] Resynced with GNU Classpath. 2005-02-10 Michael Koch [EMAIL PROTECTED] * javax/swing/JTabbedPane.java (Page.setDisplayedMnemonicIndex): Handle empty menmonic. Members: libraries/javalib/javax/swing/JTabbedPane.java:1.5-1.6 ChangeLog:1.3576-1.3577 Index: kaffe/libraries/javalib/javax/swing/JTabbedPane.java diff -u kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.5 kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.6 --- kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.5Thu Jan 27 14:07:11 2005 +++ kaffe/libraries/javalib/javax/swing/JTabbedPane.javaSun Feb 13 22:33:37 2005 @@ -518,12 +518,12 @@ * or equal to title.length. */ public void setDisplayedMnemonicIndex(int index) - throws IllegalArgumentException + throws IllegalArgumentException { if (index -1 || title != null index = title.length()) throw new IllegalArgumentException(); - if (title == null || title.charAt(index) != mnemonicKey) + if (title == null || mnemonicKey == 0 || title.charAt(index) != mnemonicKey) index = -1; underlinedChar = index; Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3576 kaffe/ChangeLog:1.3577 --- kaffe/ChangeLog:1.3576 Sun Feb 13 22:32:04 2005 +++ kaffe/ChangeLog Sun Feb 13 22:33:33 2005 @@ -2,6 +2,15 @@ Resynced with GNU Classpath. + 2005-02-10 Michael Koch [EMAIL PROTECTED] + +* javax/swing/JTabbedPane.java +(Page.setDisplayedMnemonicIndex): Handle empty menmonic. + +2005-02-13 Dalibor Topic [EMAIL PROTECTED] + + Resynced with GNU Classpath. + 2005-02-10 Graydon Hoare [EMAIL PROTECTED] * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c, ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing fixlet
PatchSet 5532 Date: 2005/02/13 22:33:37 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: swing fixlet 2005-02-13 Dalibor Topic [EMAIL PROTECTED] Resynced with GNU Classpath. 2005-02-10 Michael Koch [EMAIL PROTECTED] * javax/swing/JTabbedPane.java (Page.setDisplayedMnemonicIndex): Handle empty menmonic. Members: libraries/javalib/javax/swing/JTabbedPane.java:1.5-1.6 ChangeLog:1.3576-1.3577 Index: kaffe/libraries/javalib/javax/swing/JTabbedPane.java diff -u kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.5 kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.6 --- kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.5Thu Jan 27 14:07:11 2005 +++ kaffe/libraries/javalib/javax/swing/JTabbedPane.javaSun Feb 13 22:33:37 2005 @@ -518,12 +518,12 @@ * or equal to title.length. */ public void setDisplayedMnemonicIndex(int index) - throws IllegalArgumentException + throws IllegalArgumentException { if (index -1 || title != null index = title.length()) throw new IllegalArgumentException(); - if (title == null || title.charAt(index) != mnemonicKey) + if (title == null || mnemonicKey == 0 || title.charAt(index) != mnemonicKey) index = -1; underlinedChar = index; Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3576 kaffe/ChangeLog:1.3577 --- kaffe/ChangeLog:1.3576 Sun Feb 13 22:32:04 2005 +++ kaffe/ChangeLog Sun Feb 13 22:33:33 2005 @@ -2,6 +2,15 @@ Resynced with GNU Classpath. + 2005-02-10 Michael Koch [EMAIL PROTECTED] + +* javax/swing/JTabbedPane.java +(Page.setDisplayedMnemonicIndex): Handle empty menmonic. + +2005-02-13 Dalibor Topic [EMAIL PROTECTED] + + Resynced with GNU Classpath. + 2005-02-10 Graydon Hoare [EMAIL PROTECTED] * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c, ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing fixlet
PatchSet 5532 Date: 2005/02/13 22:33:37 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: swing fixlet 2005-02-13 Dalibor Topic [EMAIL PROTECTED] Resynced with GNU Classpath. 2005-02-10 Michael Koch [EMAIL PROTECTED] * javax/swing/JTabbedPane.java (Page.setDisplayedMnemonicIndex): Handle empty menmonic. Members: libraries/javalib/javax/swing/JTabbedPane.java:1.5-1.6 ChangeLog:1.3576-1.3577 Index: kaffe/libraries/javalib/javax/swing/JTabbedPane.java diff -u kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.5 kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.6 --- kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.5Thu Jan 27 14:07:11 2005 +++ kaffe/libraries/javalib/javax/swing/JTabbedPane.javaSun Feb 13 22:33:37 2005 @@ -518,12 +518,12 @@ * or equal to title.length. */ public void setDisplayedMnemonicIndex(int index) - throws IllegalArgumentException + throws IllegalArgumentException { if (index -1 || title != null index = title.length()) throw new IllegalArgumentException(); - if (title == null || title.charAt(index) != mnemonicKey) + if (title == null || mnemonicKey == 0 || title.charAt(index) != mnemonicKey) index = -1; underlinedChar = index; Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3576 kaffe/ChangeLog:1.3577 --- kaffe/ChangeLog:1.3576 Sun Feb 13 22:32:04 2005 +++ kaffe/ChangeLog Sun Feb 13 22:33:33 2005 @@ -2,6 +2,15 @@ Resynced with GNU Classpath. + 2005-02-10 Michael Koch [EMAIL PROTECTED] + +* javax/swing/JTabbedPane.java +(Page.setDisplayedMnemonicIndex): Handle empty menmonic. + +2005-02-13 Dalibor Topic [EMAIL PROTECTED] + + Resynced with GNU Classpath. + 2005-02-10 Graydon Hoare [EMAIL PROTECTED] * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c, ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe