I made a mistake in my last patch. I created a mauve test to verify that
this is now correct.
2005-12-19 Lillian Angel <[EMAIL PROTECTED]>
* javax/swing/text/StyledEditorKit.java
(createInputAttributes): Fixed. I made a mistake by
changing this in my last fix. I have committed a mauve test
to verify the set should be cleared first.
* javax/swing/text/html/HTMLEditorKit
(createInputAttributes): Set is cleared before adding
new attributes.
* javax/swing/text/html/HTMLDocument.java:
Added names to authors.
* javax/swing/text/html/default.css:
Fixed indentation.
Index: javax/swing/text/StyledEditorKit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/StyledEditorKit.java,v
retrieving revision 1.18
diff -u -r1.18 StyledEditorKit.java
--- javax/swing/text/StyledEditorKit.java 16 Dec 2005 21:48:20 -0000 1.18
+++ javax/swing/text/StyledEditorKit.java 19 Dec 2005 17:28:08 -0000
@@ -715,6 +715,7 @@
MutableAttributeSet set)
{
// FIXME: Filter out component, icon and element name attributes.
+ set.removeAttributes(set);
set.addAttributes(element.getAttributes());
}
}
Index: javax/swing/text/html/HTMLDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/HTMLDocument.java,v
retrieving revision 1.19
diff -u -r1.19 HTMLDocument.java
--- javax/swing/text/html/HTMLDocument.java 18 Dec 2005 01:27:43 -0000 1.19
+++ javax/swing/text/html/HTMLDocument.java 19 Dec 2005 17:28:08 -0000
@@ -61,9 +61,11 @@
import javax.swing.text.html.HTML.Tag;
/**
- * TODO: This class is not yet completetely implemented.
- *
+ * TODO: Add more comments here
+ *
* @author Audrius Meskauskas, Lithuania ([EMAIL PROTECTED])
+ * @author Anthony Balkissoon ([EMAIL PROTECTED])
+ * @author Lillian Angel ([EMAIL PROTECTED])
*/
public class HTMLDocument extends DefaultStyledDocument
{
Index: javax/swing/text/html/HTMLEditorKit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/HTMLEditorKit.java,v
retrieving revision 1.21
diff -u -r1.21 HTMLEditorKit.java
--- javax/swing/text/html/HTMLEditorKit.java 16 Dec 2005 21:48:20 -0000 1.21
+++ javax/swing/text/html/HTMLEditorKit.java 19 Dec 2005 17:28:08 -0000
@@ -1030,6 +1030,7 @@
protected void createInputAttributes(Element element,
MutableAttributeSet set)
{
+ set.removeAttributes(set);
set.addAttributes(element.getAttributes());
// FIXME: Not fully implemented.
}
Index: javax/swing/text/html/default.css
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/default.css,v
retrieving revision 1.1
diff -u -r1.1 default.css
--- javax/swing/text/html/default.css 16 Dec 2005 21:35:06 -0000 1.1
+++ javax/swing/text/html/default.css 19 Dec 2005 17:28:08 -0000
@@ -309,7 +309,8 @@
font-family: Monospaced;
}
-ul li {margin-right: 0px;
+ul li {
+ margin-right: 0px;
margin-left: 0px;
margin-top: 0px;
margin-bottom: 0px;
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
