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

Kaffe CVS cvs-commits at kaffe.org
Sat Jun 11 12:32:52 PDT 2005


PatchSet 6624 
Date: 2005/06/11 19:25:22
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: swing fixes

Members: 
	ChangeLog:1.4150->1.4151 
	libraries/javalib/javax/swing/text/DefaultStyledDocument.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4150 kaffe/ChangeLog:1.4151
--- kaffe/ChangeLog:1.4150	Sat Jun 11 19:22:59 2005
+++ kaffe/ChangeLog	Sat Jun 11 19:25:22 2005
@@ -2,6 +2,15 @@
 
 	Resynced with GNU Classpath.
 
+	2005-06-01  Roman Kennke  <roman at kennke.org>
+
+	* javax/swing/text/DefaultStyledDocument.java
+	(setLogicalStyle): Implemented this method.
+
+2005-06-11  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-06-01  Sven de Marothy  <sven at physto.se>
 
 	* java/util/GregorianCalendar.java
@@ -227,6 +236,11 @@
 	* org/omg/CORBA/SendingContext/Runtime.java,
 	org/omg/CORBA/SendingContext/RunTimeOperations.java:
 	Fixing the package statement.
+
+	2005-06-01  Tom Tromey  <tromey at redhat.com>
+
+	* org/omg/CosNaming/IstringHelper.java: Changed non-ascii
+	characters.
 
 	2005-06-01  Audrius Meskauskas <AudriusA at Bioinformatics.org>
 
Index: kaffe/libraries/javalib/javax/swing/text/DefaultStyledDocument.java
diff -u kaffe/libraries/javalib/javax/swing/text/DefaultStyledDocument.java:1.1 kaffe/libraries/javalib/javax/swing/text/DefaultStyledDocument.java:1.2
--- kaffe/libraries/javalib/javax/swing/text/DefaultStyledDocument.java:1.1	Tue Dec 21 08:47:16 2004
+++ kaffe/libraries/javalib/javax/swing/text/DefaultStyledDocument.java	Sat Jun 11 19:25:25 2005
@@ -181,8 +181,15 @@
   
   public void setLogicalStyle(int position, Style style)
   {
-    // FIXME: Implement me.
-    throw new Error("not implemented");
+    Element el = getParagraphElement(position);
+    if (el instanceof AbstractElement)
+      {
+        AbstractElement ael = (AbstractElement) el;
+        ael.setResolveParent(style);
+      }
+    else
+      throw new AssertionError("paragraph elements are expected to be"
+         + "instances of javax.swing.text.AbstractDocument.AbstractElement");
   }
 
   public void setParagraphAttributes(int offset, int length,



More information about the kaffe mailing list