PatchSet 6622
Date: 2005/06/11 19:11:33
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: swing fixes
Members:
ChangeLog:1.4148->1.4149
libraries/javalib/javax/swing/JComponent.java:1.19->1.20
libraries/javalib/javax/swing/plaf/basic/BasicFileChooserUI.java:1.2->1.3
libraries/javalib/javax/swing/text/PlainDocument.java:1.8->1.9
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4148 kaffe/ChangeLog:1.4149
--- kaffe/ChangeLog:1.4148 Sat Jun 11 11:18:43 2005
+++ kaffe/ChangeLog Sat Jun 11 19:11:33 2005
@@ -2,6 +2,35 @@
Resynced with GNU Classpath.
+ 2005-06-01 Roman Kennke <[EMAIL PROTECTED]>
+
+ * javax/swing/plaf/basic/BasicFileChooserUI.java
+ (installComponents): Changed layout of main panel from GridBagLayout
+ to BorderLayout (as is the case in Suns JDK). This fixes
+ bug#13244.
+
+ 2005-06-01 Roman Kennke <[EMAIL PROTECTED]>
+
+ * javax/swing/JPopupMenu.java
+ (insert): Do not check for index == -1 at this point, this is done
+ in java.awt.Container. Catching -1 indices here disturbes the
+ Container.addImpl which leads to bug #13247 for example.
+
+ 2005-06-01 Roman Kennke <[EMAIL PROTECTED]>
+
+ * javax/swing/text/PlainDocument.java
+ (removeUpdate): Fixed indices in call to rootElement.replace().
+
+ 2005-06-01 Roman Kennke <[EMAIL PROTECTED]>
+
+ * javax/swing/JComponent.java
+ (processKeyEvent): Call super.processKeyEvent() so that KeyEvents
+ are delivered to registered KeyListeners.
+
+2005-06-11 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2005-06-01 Sven de Marothy <[EMAIL PROTECTED]>
* java/util/TimeZone (getDefaultTimeZone): Reimplemented.
Index: kaffe/libraries/javalib/javax/swing/JComponent.java
diff -u kaffe/libraries/javalib/javax/swing/JComponent.java:1.19
kaffe/libraries/javalib/javax/swing/JComponent.java:1.20
--- kaffe/libraries/javalib/javax/swing/JComponent.java:1.19 Fri Jun 10
19:51:08 2005
+++ kaffe/libraries/javalib/javax/swing/JComponent.java Sat Jun 11 19:11:36 2005
@@ -1788,6 +1788,8 @@
*/
protected void processKeyEvent(KeyEvent e)
{
+ // let the AWT event processing send KeyEvents to registered listeners
+ super.processKeyEvent(e);
processComponentKeyEvent(e);
// FIXME: this needs to be elaborated significantly, to do all the
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicFileChooserUI.java
diff -u
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicFileChooserUI.java:1.2
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicFileChooserUI.java:1.3
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicFileChooserUI.java:1.2
Mon May 30 00:03:59 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicFileChooserUI.java
Sat Jun 11 19:11:36 2005
@@ -101,6 +101,10 @@
*/
protected class AcceptAllFileFilter extends FileFilter
{
+ public AcceptAllFileFilter()
+ {
+ }
+
/**
* DOCUMENT ME!
*
@@ -168,6 +172,10 @@
/** DOCUMENT ME! */
protected Hashtable iconCache = new Hashtable();
+ public BasicFileView()
+ {
+ }
+
/**
* DOCUMENT ME!
*
@@ -1300,7 +1308,6 @@
bottomPanel.add(closePanel, c);
filechooser.setLayout(new BorderLayout());
-
filechooser.add(topPanel, BorderLayout.NORTH);
filechooser.add(centrePanel, BorderLayout.CENTER);
filechooser.add(bottomPanel, BorderLayout.SOUTH);
Index: kaffe/libraries/javalib/javax/swing/text/PlainDocument.java
diff -u kaffe/libraries/javalib/javax/swing/text/PlainDocument.java:1.8
kaffe/libraries/javalib/javax/swing/text/PlainDocument.java:1.9
--- kaffe/libraries/javalib/javax/swing/text/PlainDocument.java:1.8 Sun May
15 17:17:10 2005
+++ kaffe/libraries/javalib/javax/swing/text/PlainDocument.java Sat Jun 11
19:11:38 2005
@@ -133,7 +133,7 @@
Element newEl = createLeafElement(rootElement,
SimpleAttributeSet.EMPTY,
start, end - len);
- rootElement.replace(start, end - start, new Element[]{ newEl });
+ rootElement.replace(i1, i1 - i1, new Element[]{ newEl });
}
else
{
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
