/[classpath]/gjdoc/src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
ViewVC logotype

Diff of /gjdoc/src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.50 by julian, Mon May 23 14:05:05 2005 UTC revision 1.51 by julian, Mon May 23 16:06:09 2005 UTC
# Line 44  import gnu.classpath.tools.StringToolkit Line 44  import gnu.classpath.tools.StringToolkit
44  import com.sun.javadoc.*;  import com.sun.javadoc.*;
45  import com.sun.tools.doclets.Taglet;  import com.sun.tools.doclets.Taglet;
46    
47    import java.io.ByteArrayInputStream;
48  import java.io.File;  import java.io.File;
49  import java.io.FileInputStream;  import java.io.FileInputStream;
50  import java.io.FileNotFoundException;  import java.io.FileNotFoundException;
# Line 103  public class HtmlDoclet Line 104  public class HtmlDoclet
104      */      */
105     private static final boolean outputHelpPage = false;     private static final boolean outputHelpPage = false;
106    
107       /**
108        *  Stores the output encoding (either the one specified using
109        *  -charset, or the platform default encoding).
110        */
111       private String outputCharset;
112    
113     private void printNavBar(HtmlPage output, String currentPage, ClassDoc currentClass)     private void printNavBar(HtmlPage output, String currentPage, ClassDoc currentClass)
114     {     {
115           output.beginDiv(CssClass.NAVBAR_TOP);           output.beginDiv(CssClass.NAVBAR_TOP);
# Line 767  public class HtmlDoclet Line 774  public class HtmlDoclet
774    
775     private void printPackageTreeRec(HtmlPage output, TreeNode node, TreeNode parentNode)     private void printPackageTreeRec(HtmlPage output, TreeNode node, TreeNode parentNode)
776     {     {
777        output.beginElement("li");        output.beginElement("li", "class", "node");
778        output.beginElement("div");        output.beginElement("div");
779        if (node.classDoc.isIncluded()) {        if (node.classDoc.isIncluded()) {
780           output.print(node.classDoc.containingPackage().name());           output.print(node.classDoc.containingPackage().name());
# Line 816  public class HtmlDoclet Line 823  public class HtmlDoclet
823    
824        output.endElement("div");        output.endElement("div");
825        output.endElement("li");        output.endElement("li");
826        output.beginElement("ul");        if (!node.children.isEmpty()) {
827        Iterator it = node.children.iterator();           output.beginElement("li", "class", "level");
828        while (it.hasNext()) {           output.beginElement("ul");
829           TreeNode child = (TreeNode)it.next();           Iterator it = node.children.iterator();
830           printPackageTreeRec(output, child, node);           while (it.hasNext()) {
831                TreeNode child = (TreeNode)it.next();
832                printPackageTreeRec(output, child, node);
833             }
834             output.endElement("ul");
835             output.endElement("li");
836        }        }
       output.endElement("ul");  
837     }     }
838    
839     private void printClassTree(HtmlPage output, ClassDoc[] classDocs)     private void printClassTree(HtmlPage output, ClassDoc[] classDocs)
# Line 1829  public class HtmlDoclet Line 1840  public class HtmlDoclet
1840              while (usageTypeIterator.hasNext()) {              while (usageTypeIterator.hasNext()) {
1841                 UsageType usageType = (UsageType)usageTypeIterator.next();                 UsageType usageType = (UsageType)usageTypeIterator.next();
1842                                
                output.endDiv(CssClass.TABLE_CONTAINER);  
1843                 output.beginTable(CssClass.USAGE_SUMMARY, new String[] { "border", "width" }, new String[] { "1", "100%" });                 output.beginTable(CssClass.USAGE_SUMMARY, new String[] { "border", "width" }, new String[] { "1", "100%" });
1844                 output.rowDiv(CssClass.USAGE_TABLE_HEADER, format("usagetype." + usageType.getId(),                 output.rowDiv(CssClass.USAGE_TABLE_HEADER, format("usagetype." + usageType.getId(),
1845                                                                   classDoc.qualifiedName()));                                                                   classDoc.qualifiedName()));
# Line 1947  public class HtmlDoclet Line 1957  public class HtmlDoclet
1957           output.endElement("code");           output.endElement("code");
1958           output.endElement("li");           output.endElement("li");
1959    
1960             output.beginElement("li");
1961    
1962           if (it.hasPrevious()) {           if (it.hasPrevious()) {
1963              output.beginElement("ul", new String[] { "class" }, new String[] { "inheritance " + (level + 1) });              output.beginElement("ul", new String[] { "class" }, new String[] { "inheritance " + (level + 1) });
1964              printSuperTreeRec(output, it, level + 1);              printSuperTreeRec(output, it, level + 1);
1965              output.endElement("ul");              output.endElement("ul");
1966           }           }
1967    
1968             output.endElement("li");
1969        }        }
1970     }     }
1971    
# Line 3357  public class HtmlDoclet Line 3371  public class HtmlDoclet
3371    
3372     private String getOutputCharset()     private String getOutputCharset()
3373     {     {
3374        return optionCharset.getValue();        if (null == outputCharset) {
3375    
3376             if (null != optionCharset.getValue()) {
3377                outputCharset = optionCharset.getValue();
3378             }
3379             else {
3380                String fileEncoding = System.getProperty("file.encoding");
3381                if (null != fileEncoding) {
3382                   try {
3383                      outputCharset = Charset.forName(fileEncoding).name();
3384                   }
3385                   catch (Exception ignore) {
3386                   }
3387                }
3388    
3389                if (null == outputCharset) {
3390                   printWarning("Cannot determine platform default charset, falling back to ISO-8859-1.");
3391                   outputCharset = "ISO-8859-1";
3392                }
3393             }
3394          }
3395          return outputCharset;
3396     }     }
3397    
3398     public InlineTagRenderer getInlineTagRenderer()     public InlineTagRenderer getInlineTagRenderer()

Legend:
Removed from v.1.50  
changed lines
  Added in v.1.51

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26