[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: swing and AWT fixes

[Kaffe CVS]

PatchSet 6870 
Date: 2005/08/25 01:40:19
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: swing and AWT fixes

Members: 
	ChangeLog:1.4391->1.4392 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.24->1.25 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkSelection.java:1.1->1.2 
	libraries/javalib/java/awt/Label.java:1.10->1.11 
	libraries/javalib/javax/swing/ImageIcon.java:1.11->1.12 
	libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java:1.11->1.12 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4391 kaffe/ChangeLog:1.4392
--- kaffe/ChangeLog:1.4391	Thu Aug 25 00:51:21 2005
+++ kaffe/ChangeLog	Thu Aug 25 01:40:19 2005
@@ -1,3 +1,37 @@
+2005-08-25  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-08-21  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+        * gnu/java/awt/peer/gtk/GtkSelection.java: Update for new FSF
+        address.
+
+	2005-08-21  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+        * javax/swing/plaf/basic/BasicSplitPaneUI.java
+        (KEYBOARD_DIVIDER_MOVE_OFFSET): Initialize with 3.
+
+	2005-08-21  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+        * javax/swing/ImageIcon.java (getIconHeight): Return -1 if image
+        is null.
+        (getIconWidth): Likewise.
+
+	2005-08-21  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+        (window_get_frame_extents): If window is not decorated, guess 0,
+        0, 0, 0 inset values.
+
+	2005-08-21  Tom Tromey  <tromey at redhat.com>
+
+        * javax/swing/text/AbstractWriter.java (NEWLINE): Now 'final'.
+
+	2005-08-21  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+        * java/awt/Label.java (setText): Refine text inequality test.
+
 2005-08-24  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/Makefile.am.in:
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.24 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.25
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.24	Fri Aug 19 01:27:55 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	Thu Aug 25 01:40:22 2005
@@ -1412,10 +1412,20 @@
 
   /* Guess frame extents in case _NET_FRAME_EXTENTS is not
      supported. */
-  *top = 23;
-  *left = 6;
-  *bottom = 6;
-  *right = 6;
+  if (gtk_window_get_decorated (GTK_WINDOW (window)))
+    {
+      *top = 23;
+      *left = 6;
+      *bottom = 6;
+      *right = 6;
+    }
+  else
+    {
+      *top = 0;
+      *left = 0;
+      *bottom = 0;
+      *right = 0;
+    }
 
   /* Request that the window manager set window's
      _NET_FRAME_EXTENTS property. */
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkSelection.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkSelection.java:1.1 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkSelection.java:1.2
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkSelection.java:1.1	Wed Aug 17 22:38:29 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkSelection.java	Thu Aug 25 01:40:23 2005
@@ -15,8 +15,8 @@
 
 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.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
Index: kaffe/libraries/javalib/java/awt/Label.java
diff -u kaffe/libraries/javalib/java/awt/Label.java:1.10 kaffe/libraries/javalib/java/awt/Label.java:1.11
--- kaffe/libraries/javalib/java/awt/Label.java:1.10	Sun Aug 21 19:54:53 2005
+++ kaffe/libraries/javalib/java/awt/Label.java	Thu Aug 25 01:40:23 2005
@@ -215,7 +215,8 @@
 public synchronized void
 setText(String text)
 {
-  if (this.text != text)
+  if ((this.text == null && text != null)
+      || (this.text != null && ! this.text.equals(text)))
     {
       this.text = text;
 
Index: kaffe/libraries/javalib/javax/swing/ImageIcon.java
diff -u kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.11 kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.12
--- kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.11	Sat Jul 30 16:39:24 2005
+++ kaffe/libraries/javalib/javax/swing/ImageIcon.java	Thu Aug 25 01:40:23 2005
@@ -302,11 +302,19 @@
 
   public int getIconHeight()
   {
+    // Sun returns -1 if the image is not loaded.
+    if (image == null)
+      return -1;
+
     return image.getHeight(observer);
   }
 
   public int getIconWidth()
   {
+    // Sun returns -1 if the image is not loaded.
+    if (image == null)
+      return -1;
+
     return image.getWidth(observer);
   }
 
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java:1.11 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java:1.12
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java:1.11	Sat Aug 13 21:45:52 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneUI.java	Thu Aug 25 01:40:23 2005
@@ -870,7 +870,8 @@
   transient int lastDragLocation = -1;
 
   /** The distance the divider is moved when moved by keyboard actions. */
-  protected static int KEYBOARD_DIVIDER_MOVE_OFFSET;
+  // Sun defines this as 3
+  protected static int KEYBOARD_DIVIDER_MOVE_OFFSET = 3;
 
   /** The divider that divides this JSplitPane. */
   protected BasicSplitPaneDivider divider;