You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/05/22 21:09:24 UTC
svn commit: r1126174 - in
/tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc:
TapestryDocTaglet.java XDocStreamer.java
Author: hlship
Date: Sun May 22 19:09:23 2011
New Revision: 1126174
URL: http://svn.apache.org/viewvc?rev=1126174&view=rev
Log:
TAP5-1528: Make streamed xdoc content "blend in" better
Modified:
tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
Modified: tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java?rev=1126174&r1=1126173&r2=1126174&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java (original)
+++ tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java Sun May 22 19:09:23 2011
@@ -187,11 +187,10 @@ public class TapestryDocTaglet implement
{
try
{
- writer.write("<dt><b>Additional Notes:</b></dt><dd>");
+ // Close the definition list, to avoid unwanted indents. Very, very ugly.
new XDocStreamer(xdocFile, writer).writeContent();
-
- writer.write("</dd>");
+ // Open a new (empty) definition list, that HtmlDoclet will close.
}
catch (Exception ex)
{
Modified: tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java?rev=1126174&r1=1126173&r2=1126174&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/XDocStreamer.java Sun May 22 19:09:23 2011
@@ -158,13 +158,22 @@ public class XDocStreamer
if (localName.equals("section"))
{
- writeSectionHeader(atts, "h3");
+
+ String name = getAttribute(atts, "name");
+
+ // More JavaDoc ugliness; this makes sections fit in well with the main
+ // output.
+
+ write(String.format("<dt><b>%s:</b></dt><dd>", name));
+
+ endElementHandlers.push(writeClose("dd"));
+
return;
}
if (localName.equals("subsection"))
{
- writeSectionHeader(atts, "h4");
+ writeSectionHeader(atts, "h3");
return;
}