This patch breaks the build. For me, at least. I tried from a fresh tree and that didn't work. It did compile minus this patch.
/Sven On Sun, 2006-07-16 at 16:54 +0200, Audrius Meskauskas wrote: > Fixing the 28392, I have concluded that HTMLEditorKit is getting more > and more unnecessarily complicated functionality, and that the > suggestions of Roman and others (discussed in Brussels) to have the > custom DTD model for our Swing are probably correct. This patch > introduces the HTML_401Swing.java which is derived from HTML_401F.java > and allows us to define additional rules exclusively for the parser of > the HTMLDocument. It will not affect any applications that use the > parser directly, creating the instance of the ParserDelegator. > > The custom DTD model generates the implied P tags for the top level > document body text that is not in a paragraph. It also generates P tags > for the top level tags like I, B, U, A, FONT and so on, because, if not > wrapped into paragraph at the top body level, they cause the same > problems. The tags are not generated when they are not necessary and are > closed where they end is supposed from the context. The DTD model can be > extended to work about more our HTML rendering problems. > > The implied paragraph handling in HTMLDocument is no longer needed as is > removed. > > 2006-07-16 Audrius Meskauskas <[EMAIL PROTECTED]> > > PR 28392 > * examples/gnu/classpath/examples/swing/HtmlDemo.java: > Removed heading p tag from the parsing example. > * gnu/javax/swing/text/html/parser/HTML_401F.java: > (createHtmlContentModel): Explained. > (defineElements): Call getBodyElements to get the body > elements. (getBodyElements): New method. (model): > Made protected from private. > * gnu/javax/swing/text/html/parser/htmlValidator.java > (openTag): Mind that current content model may be null. > (tagIsValidForContext): If the tag is PCDATA, and it is not > valid for context, but the paragraph (P) is valid for context, > suggest to insert the P tag here. > * javax/swing/text/html/HTMLDocument.java (HTMLReader.addContent, > HTMLReader.blockOpen, HTMLReader.blockClose): Do not handle > implied P tags here. > * javax/swing/text/html/HTMLEditorKit.java (getParser): > Get the custom parser, using DTD. > * javax/swing/text/html/parser/ParserDelegator.java: > Removed the obsolete note that HTMLEditorKit does not exist. > * gnu/javax/swing/text/html/parser/GnuParserDelegator.java, > gnu/javax/swing/text/html/parser/HTML_401Swing.java: New files. -- Sven de Marothy <[EMAIL PROTECTED]>
