CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Roman Kennke <rabbit78> 06/08/24 16:58:11
Modified files:
. : ChangeLog
javax/swing/text/html: CSS.java HTMLDocument.java
HTMLEditorKit.java InlineView.java
ParagraphView.java StyleSheet.java
Added files:
javax/swing/text/html: MultiAttributeSet.java MultiStyle.java
ViewAttributeSet.java
Removed files:
javax/swing/text/html: CSSParser.java
Log message:
2006-08-24 Roman Kennke <[EMAIL PROTECTED]>
* javax/swing/text/html/CSSParser.java: Removed.
* javax/swing/text/html/CSS.java
(getValue): New helper method. Returns special converter
instances for certain kinds of property values.
* javax/swing/text/html/HTMLDocument.java
(HTMLReader.CharacterAction.start): Don't translate tags
here. Instead, store the attributes directly with the tag
as key.
(content): Removed field. The Content object is handled
by AbstractDocument.
(styleSheet): Removed field. The styleSheet is the styleContext
of this document and handled by the DefaultStyledDocument
already.
(HTMLDocument(Content,StyleSheet): Simply call super here.
The super classes already handle the content and styleContext.
(HTMLDocument()): Call this() with a default GapContent and
StyleSheet.
(getStyleSheet): Return the styleContext here.
(insertUpdate): New method. Overridden to add the
CONTENT dummy tag to the element's attributes.
(setBase): Set the base on the styleContext.
* javax/swing/text/html/HTMLEditorKit.java
(styleContext): Removed unneeded field.
(styleSheet): Made field private.
(HTMLEditorKit): Do nothing here. The StyleSheet is
created lazily in getStyleSheet(). A styleContext is not
needed here.
(getStyleSheet): Create StyleSheet correctly.
(insertHTML): Removed unneeded cast.
* javax/swing/text/html/InlineView.java
(attributes): New field.
(changedUpdate): Reload attributes. Trigger preferenceChanged.
(getAttributes): Implemented to fetch the attributes from
the stylesheet.
* javax/swing/text/html/MultiAttributeSet.java: New class.
Multiplexes between several AttributeSets.
* javax/swing/text/html/MultiStyle.java: New class.
Multiplexes between several Styles.
* javax/swing/text/html/ParagraphView.java
(attributes): New field.
(getAttributes): Implemented to fetch the attributes from
the stylesheet.
* javax/swing/text/html/StyleSheet.java
(CssParser): Removed inner class.
(CSSStyle): New inner class. Represents a style defined
by a CSS rule.
(CSSStyleSheetParserCallback): New class, for parsing
CSS stylesheets.
(css): New field. Stores the CSS rules.
(resolvedStyles): New field. Stores resolved styles.
(StyleSheet): Initialize resolvedStyles map.
(addRule): Removed bogus impl.
(getFont): Implemented to fetch font, based on CSS rules.
(getResolvedStyle): New helper method. Looks up resolved
styles, and resolves a style if necessary.
(resolveStyle): New pair of helper methods. Resolves
CSS style rules.
(getRule(String)): Provide rudimentary implementation.
(getRule(Tag,Element)): Implemented.
(getViewAttributes): Implemented.
(loadRules): Implemented.
(translateHTMLToCSS): Tagged as not implemented.
* javax/swing/text/html/ViewAttributeSet.java: New class.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.8452&r2=1.8453
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/CSS.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/HTMLDocument.java?cvsroot=classpath&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/HTMLEditorKit.java?cvsroot=classpath&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/InlineView.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/ParagraphView.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/StyleSheet.java?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/MultiAttributeSet.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/MultiStyle.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/ViewAttributeSet.java?cvsroot=classpath&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/html/CSSParser.java?cvsroot=classpath&r1=1.2&r2=0
