[kaffe] CVS kaffe (robilad): Resynced with gjdoc
Kaffe CVS
cvs-commits at kaffe.org
Sat Dec 24 12:04:05 PST 2005
PatchSet 7045
Date: 2005/12/24 19:56:46
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with gjdoc
2005-12-24 Dalibor Topic <robilad at kaffe.org>
* tools/gjdoc/javalib: Resynched GNU gjdoc.
Members:
ChangeLog:1.4564->1.4565
tools/gjdoc/javalib/Makefile.am:1.19->1.20
tools/gjdoc/javalib/Makefile.in:1.68->1.69
tools/gjdoc/javalib/doctranslets/gjdoc_common.xsl:1.3->1.4
tools/gjdoc/javalib/doctranslets/html/about.xsl:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/allclasses.xsl:1.4->1.5
tools/gjdoc/javalib/doctranslets/html/allpackages.xsl:1.4->1.5
tools/gjdoc/javalib/doctranslets/html/alphaindex.xsl:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/alphaindex_chunked.xsl:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/classdoc-source.xsl:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/classdoc-uses.xsl:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/classdoc.xsl:1.4->1.5
tools/gjdoc/javalib/doctranslets/html/deprecated.xsl:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/descriptor.xsl:1.3->1.4
tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl:1.3->1.4
tools/gjdoc/javalib/doctranslets/html/fulltree.xsl:1.4->1.5
tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl:1.4->1.5
tools/gjdoc/javalib/doctranslets/html/help.xsl:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/html_common.xsl:1.3->1.4
tools/gjdoc/javalib/doctranslets/html/index.xsl:1.4->1.5
tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl:1.4->1.5
tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl:1.4->1.5
tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl:1.4->1.5
tools/gjdoc/javalib/doctranslets/html/serialized.xsl:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/res/gjdoc.js:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-clean.css:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-fixed.css:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-sclara.css:1.2->1.3
tools/gjdoc/javalib/doctranslets/html/res/gjdochtml.css:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java:1.8->1.9
tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:1.8->1.9
tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java:1.6->1.7
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/AbstractTagImpl.java:1.6->1.7
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocImpl.java:1.7->1.8
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/DocImpl.java:1.7->1.8
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java:1.7->1.8
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/FieldDocImpl.java:1.6->1.7
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/Main.java:1.10->1.11
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/PackageDocImpl.java:1.6->1.7
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/RootDocImpl.java:1.7->1.8
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/SeeTagImpl.java:1.7->1.8
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java:INITIAL->1.1
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/expr/Context.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/expr/Evaluator.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/taglets/AuthorTaglet.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/taglets/CodeTaglet.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/taglets/CopyrightTaglet.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/taglets/DeprecatedTaglet.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/taglets/GenericTaglet.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/taglets/SinceTaglet.java:1.4->1.5
tools/gjdoc/javalib/gnu/classpath/tools/taglets/ValueTaglet.java:1.3->1.4
tools/gjdoc/javalib/gnu/classpath/tools/taglets/VersionTaglet.java:1.4->1.5
tools/gjdoc/javalib/htmldoclet/gjdochtml-clean-layout.css:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4564 kaffe/ChangeLog:1.4565
--- kaffe/ChangeLog:1.4564 Sat Dec 24 05:12:11 2005
+++ kaffe/ChangeLog Sat Dec 24 19:56:46 2005
@@ -1,3 +1,7 @@
+2005-12-24 Dalibor Topic <robilad at kaffe.org>
+
+ * tools/gjdoc/javalib: Resynched GNU gjdoc.
+
2005-12-23 Ito Kazumitsu <kaz at maczuka.gcd.org>
* kaffe/kaffevm/access.c
Index: kaffe/tools/gjdoc/javalib/Makefile.am
diff -u kaffe/tools/gjdoc/javalib/Makefile.am:1.19 kaffe/tools/gjdoc/javalib/Makefile.am:1.20
--- kaffe/tools/gjdoc/javalib/Makefile.am:1.19 Sat Dec 3 12:55:17 2005
+++ kaffe/tools/gjdoc/javalib/Makefile.am Sat Dec 24 19:56:51 2005
@@ -141,6 +141,7 @@
gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java \
gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java \
gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java \
+ gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java \
gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java \
gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java \
gnu/classpath/tools/gjdoc/expr/ConstantByte.java \
Index: kaffe/tools/gjdoc/javalib/Makefile.in
diff -u kaffe/tools/gjdoc/javalib/Makefile.in:1.68 kaffe/tools/gjdoc/javalib/Makefile.in:1.69
--- kaffe/tools/gjdoc/javalib/Makefile.in:1.68 Sun Dec 18 17:36:32 2005
+++ kaffe/tools/gjdoc/javalib/Makefile.in Sat Dec 24 19:56:51 2005
@@ -475,6 +475,7 @@
gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java \
gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java \
gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java \
+ gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java \
gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java \
gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java \
gnu/classpath/tools/gjdoc/expr/ConstantByte.java \
Index: kaffe/tools/gjdoc/javalib/doctranslets/gjdoc_common.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/gjdoc_common.xsl:1.3 kaffe/tools/gjdoc/javalib/doctranslets/gjdoc_common.xsl:1.4
--- kaffe/tools/gjdoc/javalib/doctranslets/gjdoc_common.xsl:1.3 Mon Jul 4 00:09:14 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/gjdoc_common.xsl Sat Dec 24 19:56:51 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Common templates for HTML generation.
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/about.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/about.xsl:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/about.xsl:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/about.xsl:1.2 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/about.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the class descriptor files for HTML documentation.
@@ -48,7 +48,7 @@
<xsl:with-param name="p_pagetitle" select="'Help'"/>
</xsl:call-template>
</head>
- <body class="classdoc" onload="top.contentPageLoaded();">
+ <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded()">
<div class="pagebody">
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/allclasses.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/allclasses.xsl:1.4 kaffe/tools/gjdoc/javalib/doctranslets/html/allclasses.xsl:1.5
--- kaffe/tools/gjdoc/javalib/doctranslets/html/allclasses.xsl:1.4 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/allclasses.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the allclasses.html file for HTML documentation.
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/allpackages.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/allpackages.xsl:1.4 kaffe/tools/gjdoc/javalib/doctranslets/html/allpackages.xsl:1.5
--- kaffe/tools/gjdoc/javalib/doctranslets/html/allpackages.xsl:1.4 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/allpackages.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the allpackages.html file for HTML documentation.
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/alphaindex.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/alphaindex.xsl:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/alphaindex.xsl:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/alphaindex.xsl:1.2 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/alphaindex.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the alphaindex.html file for HTML documentation.
@@ -47,7 +47,7 @@
</xsl:call-template>
<xsl:call-template name="include_common"/>
</head>
- <body class="classdoc" onload="top.contentPageLoaded(document.title);">
+ <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
<!-- Top Navigation Bar -->
<xsl:call-template name="output_navbar">
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/alphaindex_chunked.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/alphaindex_chunked.xsl:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/alphaindex_chunked.xsl:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/alphaindex_chunked.xsl:1.2 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/alphaindex_chunked.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the alphaindex.html file for HTML documentation.
@@ -47,7 +47,7 @@
</xsl:call-template>
<xsl:call-template name="include_common"/>
</head>
- <body class="classdoc" onload="top.contentPageLoaded(document.title);">
+ <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
<div class="pagebody">
<!-- Top Navigation Bar -->
<xsl:call-template name="output_navbar">
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc-source.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc-source.xsl:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc-source.xsl:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc-source.xsl:1.2 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc-source.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Outputs an HTML file showing the source code for the class
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc-uses.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc-uses.xsl:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc-uses.xsl:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc-uses.xsl:1.2 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc-uses.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Outputs an HTML file showing the source code for the class
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc.xsl:1.4 kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc.xsl:1.5
--- kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc.xsl:1.4 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the class descriptor files for HTML documentation.
@@ -122,7 +122,7 @@
</xsl:call-template>
<xsl:call-template name="include_common"/>
</head>
- <body class="classdoc" onload="top.contentPageLoaded(document.title);">
+ <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
<div class="pagebody">
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/deprecated.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/deprecated.xsl:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/deprecated.xsl:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/deprecated.xsl:1.2 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/deprecated.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the deprecation information page for HTML documentation.
@@ -55,7 +55,7 @@
</xsl:call-template>
<xsl:call-template name="include_common"/>
</head>
- <body class="classdoc" onload="top.contentPageLoaded(document.title);">
+ <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
<!-- Top Navigation Bar -->
<xsl:call-template name="output_navbar">
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/descriptor.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/descriptor.xsl:1.3 kaffe/tools/gjdoc/javalib/doctranslets/html/descriptor.xsl:1.4
--- kaffe/tools/gjdoc/javalib/doctranslets/html/descriptor.xsl:1.3 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/descriptor.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the index.html file for HTML documentation. This is only
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl:1.3 kaffe/tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl:1.4
--- kaffe/tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl:1.3 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Returns a list of files generated by this stylesheet complex.
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/fulltree.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/fulltree.xsl:1.4 kaffe/tools/gjdoc/javalib/doctranslets/html/fulltree.xsl:1.5
--- kaffe/tools/gjdoc/javalib/doctranslets/html/fulltree.xsl:1.4 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/fulltree.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the fulltree.html file for HTML documentation.
@@ -139,7 +139,7 @@
</xsl:call-template>
<xsl:call-template name="include_common"/>
</head>
- <body class="classdoc" onload="top.contentPageLoaded(document.title);">
+ <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
<div class="pagebody">
<!-- Top Navigation Bar -->
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl:1.4 kaffe/tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl:1.5
--- kaffe/tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl:1.4 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Returns a list of files generated by this stylesheet complex.
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/help.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/help.xsl:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/help.xsl:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/help.xsl:1.2 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/help.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the class descriptor files for HTML documentation.
@@ -48,7 +48,7 @@
</xsl:call-template>
<xsl:call-template name="include_common"/>
</head>
- <body class="classdoc" onload="top.contentPageLoaded(document.title);">
+ <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
<!-- Top Navigation Bar -->
<xsl:call-template name="output_navbar">
<xsl:with-param name="p_show_frames" select="1"/>
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/html_common.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/html_common.xsl:1.3 kaffe/tools/gjdoc/javalib/doctranslets/html/html_common.xsl:1.4
--- kaffe/tools/gjdoc/javalib/doctranslets/html/html_common.xsl:1.3 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/html_common.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Common templates for HTML generation.
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/index.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/index.xsl:1.4 kaffe/tools/gjdoc/javalib/doctranslets/html/index.xsl:1.5
--- kaffe/tools/gjdoc/javalib/doctranslets/html/index.xsl:1.4 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/index.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the index.html file for HTML documentation. This is only
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl:1.4 kaffe/tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl:1.5
--- kaffe/tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl:1.4 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the index.html file for HTML documentation. This is only
@@ -62,7 +62,7 @@
</xsl:call-template>
<xsl:call-template name="include_common"/>
</head>
- <body class="classdoc" onload="top.contentPageLoaded(document.title);">
+ <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)">
<!-- Top Navigation Bar -->
<xsl:call-template name="output_navbar">
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl:1.4 kaffe/tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl:1.5
--- kaffe/tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl:1.4 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the package descriptor files for HTML documentation.
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl:1.4 kaffe/tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl:1.5
--- kaffe/tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl:1.4 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the package descriptor files for HTML documentation.
@@ -47,7 +47,7 @@
</xsl:call-template>
<xsl:call-template name="include_common"/>
</head>
- <body class="classdoc" onload="top.contentPageLoaded(getTitle());">
+ <body class="classdoc" onload="if(parent.contentPageLoaded)parent.contentPageLoaded(getTitle())">
<!-- Top Navigation Bar -->
<xsl:call-template name="output_navbar">
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/serialized.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/serialized.xsl:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/serialized.xsl:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/serialized.xsl:1.2 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/serialized.xsl Sat Dec 24 19:56:52 2005
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA.
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
-->
<!-- Creates the deprecation information page for HTML documentation.
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdoc.js
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdoc.js:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdoc.js:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdoc.js:1.2 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdoc.js Sat Dec 24 19:56:52 2005
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
/**
* Sets a new stylesheet for a single frame.
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-clean.css
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-clean.css:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-clean.css:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-clean.css:1.2 Mon Jul 4 00:09:15 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-clean.css Sat Dec 24 19:56:52 2005
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
body.classdoc {
background: white;
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-fixed.css
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-fixed.css:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-fixed.css:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-fixed.css:1.2 Mon Jul 4 00:09:16 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-fixed.css Sat Dec 24 19:56:52 2005
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
table {
border: none !important;
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-sclara.css
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-sclara.css:1.2 kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-sclara.css:1.3
--- kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-sclara.css:1.2 Mon Jul 4 00:09:16 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml-sclara.css Sat Dec 24 19:56:52 2005
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
div.section-header,
h1.classdoc-header {
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml.css
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml.css:1.3 kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml.css:1.4
--- kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml.css:1.3 Mon Jul 4 00:09:16 2005
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/res/gjdochtml.css Sat Dec 24 19:56:52 2005
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
body {
background: white;
Index: kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java
diff -u kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java:1.8 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java:1.9
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java:1.8 Sat Jul 9 00:01:38 2005
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java Sat Dec 24 19:56:53 2005
@@ -1359,7 +1359,7 @@
protected boolean isSinglePackage()
{
- return 1 == getAllPackages().size();
+ return getAllPackages().size() <= 1;
}
protected PackageDoc getSinglePackage()
Index: kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java
diff -u kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java:1.3 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java:1.4
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java:1.3 Sat Jul 9 00:01:39 2005
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java Sat Dec 24 19:56:53 2005
@@ -69,6 +69,9 @@
URL packageListDirURL;
if (null != packageListDir) {
+ if (!packageListDir.endsWith("/")) {
+ packageListDir += "/";
+ }
packageListDirURL = new URL(new File(System.getProperty("user.dir")).toURL(),
packageListDir);
}
@@ -89,22 +92,27 @@
URL gjdocPropertiesURL = new URL(packageListDirURL,
"gjdoc.properties");
- InputStream propertiesIn = gjdocPropertiesURL.openStream();
- if (null != in) {
- Properties properties = new Properties();
- properties.load(propertiesIn);
- propertiesIn.close();
+ try {
+ InputStream propertiesIn = gjdocPropertiesURL.openStream();
+ if (null != in) {
+ Properties properties = new Properties();
+ properties.load(propertiesIn);
+ propertiesIn.close();
- String gjdocCompatProperty = properties.getProperty("gjdoc.compat");
- if (null != gjdocCompatProperty) {
- javadocCompatible = "true".equals(properties.getProperty("gjdoc.compat"));
- }
- else {
- javadocCompatible = true;
- }
- }
- else {
- javadocCompatible = true;
+ String gjdocCompatProperty = properties.getProperty("gjdoc.compat");
+ if (null != gjdocCompatProperty) {
+ javadocCompatible = "true".equals(properties.getProperty("gjdoc.compat"));
+ }
+ else {
+ javadocCompatible = true;
+ }
+ }
+ else {
+ javadocCompatible = true;
+ }
+ }
+ catch (FileNotFoundException e) {
+ javadocCompatible = true;
}
}
Index: kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
diff -u kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:1.8 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:1.9
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:1.8 Sat Jul 9 00:01:39 2005
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java Sat Dec 24 19:56:53 2005
@@ -62,20 +62,25 @@
import java.nio.charset.Charset;
+import java.text.DateFormat;
import java.text.MessageFormat;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.Collection;
+import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
+import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.SortedSet;
+import java.util.TimeZone;
import java.util.TreeSet;
public class HtmlDoclet
@@ -132,7 +137,7 @@
}
else {
output.beginSpan(CssClass.NAVBAR_ITEM_ENABLED);
- output.beginAnchor(output.getPathToRoot() + "/index-noframes" + filenameExtension);
+ output.beginAnchor(output.getPathToRoot() + "/overview-summary" + filenameExtension);
output.print("Overview");
output.endAnchor();
output.endSpan(CssClass.NAVBAR_ITEM_ENABLED);
@@ -151,7 +156,7 @@
output.beginSpan(CssClass.NAVBAR_ITEM_ENABLED);
String packageHref;
if (isSinglePackage()) {
- packageHref = output.getPathToRoot() + "/" + getPackageURL(getSinglePackage()) + "/package-summary" + filenameExtension;
+ packageHref = output.getPathToRoot() + "/" + getPackageURL(getSinglePackage()) + "package-summary" + filenameExtension;
}
else {
packageHref = "package-summary" + filenameExtension;
@@ -263,7 +268,7 @@
output.beginSpan(CssClass.NAVBAR_ITEM_ENABLED);
String treeHref;
if (isSinglePackage() && overviewLevel) {
- treeHref = getPackageURL(getSinglePackage()) + "/tree" + filenameExtension;
+ treeHref = getPackageURL(getSinglePackage()) + "tree" + filenameExtension;
}
else {
treeHref = "tree" + filenameExtension;
@@ -537,14 +542,14 @@
output.beginRow();
output.beginCell(CssClass.NAVBAR_TOP_NAVI);
if (null != prevPackage) {
- output.anchor(output.getPathToRoot() + "/" + getPackageURL(prevPackage) + "/package-summary" + filenameExtension, "Prev Package");
+ output.anchor(output.getPathToRoot() + "/" + getPackageURL(prevPackage) + "package-summary" + filenameExtension, "Prev Package");
}
else {
output.print("Prev Package");
}
output.print(" | ");
if (null != nextPackage) {
- output.anchor(output.getPathToRoot() + "/" + getPackageURL(nextPackage) + "/package-summary" + filenameExtension, "Next Package");
+ output.anchor(output.getPathToRoot() + "/" + getPackageURL(nextPackage) + "package-summary" + filenameExtension, "Next Package");
}
else {
output.print("Next Package");
@@ -775,8 +780,11 @@
output.beginElement("li", "class", "node");
output.beginElement("div");
if (node.classDoc.isIncluded()) {
- output.print(node.classDoc.containingPackage().name());
- output.print(".");
+ String packageName = node.classDoc.containingPackage().name();
+ if (packageName.length() > 0) {
+ output.print(packageName);
+ output.print(".");
+ }
output.beginSpan(CssClass.TREE_LINK);
printType(output, node.classDoc);
output.endSpan(CssClass.TREE_LINK);
@@ -926,7 +934,7 @@
Iterator it = allPackages.iterator();
while (it.hasNext()) {
PackageDoc packageDoc = (PackageDoc)it.next();
- output.beginAnchor(getPackageURL(packageDoc) + "/tree" + filenameExtension);
+ output.beginAnchor(getPackageURL(packageDoc) + "tree" + filenameExtension);
output.print(packageDoc.name());
output.endAnchor();
if (it.hasNext()) {
@@ -953,7 +961,7 @@
String anchor = null;
String description = null;
if (entry instanceof PackageDoc) {
- output.beginAnchor(getPackageURL((PackageDoc)entry) + "/package-summary" + filenameExtension);
+ output.beginAnchor(getPackageURL((PackageDoc)entry) + "package-summary" + filenameExtension);
output.print(entry.name());
output.endAnchor();
output.print(" - package");
@@ -1037,8 +1045,8 @@
if (isSinglePackage()) {
output.atomicElement("frame",
new String[] { "src", "name" },
- new String[] { getPackageURL(getSinglePackage()) + "/classes" + filenameExtension, "classes" });
- contentURL = getPackageURL(getSinglePackage()) + "/package-summary.html";
+ new String[] { getPackageURL(getSinglePackage()) + "classes" + filenameExtension, "classes" });
+ contentURL = getPackageURL(getSinglePackage()) + "package-summary.html";
}
else {
output.beginElement("frameset", "rows", "25%,75%");
@@ -1049,7 +1057,7 @@
new String[] { "src", "name" },
new String[] { "all-classes" + filenameExtension, "classes" });
output.endElement("frameset");
- contentURL = "index-noframes" + filenameExtension;
+ contentURL = "overview-summary" + filenameExtension;
}
output.atomicElement("frame",
new String[] { "src", "name" },
@@ -1085,7 +1093,7 @@
while (it.hasNext()) {
PackageDoc packageDoc = (PackageDoc)it.next();
output.beginSpan(CssClass.PACKAGE_MENU_ENTRY);
- output.beginAnchor(getPackageURL(packageDoc) + "/classes" + filenameExtension,
+ output.beginAnchor(getPackageURL(packageDoc) + "classes" + filenameExtension,
null,
"classes");
if (packageDoc.name().length() > 0) {
@@ -1278,30 +1286,32 @@
}
output.div(CssClass.INDEX_TITLE, title);
- output.beginDiv(CssClass.INDEX_LETTERS);
+ if (null != letter || getCategorizedIndex().keySet().size() > 1) {
+ output.beginDiv(CssClass.INDEX_LETTERS);
- Iterator it = getCategorizedIndex().keySet().iterator();
- int n = 1;
- while (it.hasNext()) {
- Character c = (Character)it.next();
- output.beginSpan(CssClass.INDEX_LETTER);
- if (letter != null) {
- output.beginAnchor("alphaindex-" + n + filenameExtension);
- }
- else {
- output.beginAnchor("#" + c);
+ Iterator it = getCategorizedIndex().keySet().iterator();
+ int n = 1;
+ while (it.hasNext()) {
+ Character c = (Character)it.next();
+ output.beginSpan(CssClass.INDEX_LETTER);
+ if (letter != null) {
+ output.beginAnchor("alphaindex-" + n + filenameExtension);
+ }
+ else {
+ output.beginAnchor("#" + c);
+ }
+ output.print(c.toString());
+ output.endAnchor();
+ output.endSpan(CssClass.INDEX_LETTER);
+ output.beginSpan(CssClass.INDEX_LETTER_SPACER);
+ output.print(" ");
+ output.endSpan(CssClass.INDEX_LETTER_SPACER);
+ ++n;
}
- output.print(c.toString());
- output.endAnchor();
- output.endSpan(CssClass.INDEX_LETTER);
- output.beginSpan(CssClass.INDEX_LETTER_SPACER);
- output.print(" ");
- output.endSpan(CssClass.INDEX_LETTER_SPACER);
- ++n;
}
- }
- output.endDiv(CssClass.INDEX_LETTERS);
+ output.endDiv(CssClass.INDEX_LETTERS);
+ }
if (null != letter) {
printIndexCategory(output, letter, classList);
@@ -1634,6 +1644,15 @@
output.beginAnchor("http://www.gnu.org/software/classpath/cp-tools/", "", "_top");
output.print("GNU Classpath Tools");
output.endAnchor();
+ output.print(", on ");
+ DateFormat format = DateFormat.getDateTimeInstance(DateFormat.LONG,
+ DateFormat.LONG,
+ Locale.US);
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"),
+ Locale.US);
+ format.setCalendar(cal);
+ output.print(format.format(new Date()));
+ output.print(".");
output.endDiv(CssClass.ABOUT_GENERATOR);
printNavBarBottom(output, "about");
@@ -1704,7 +1723,7 @@
throws IOException
{
HtmlPage output = newHtmlPage(new File(getTargetDirectory(),
- "index-noframes" + filenameExtension),
+ "overview-summary" + filenameExtension),
".");
output.beginPage(getWindowTitle(),
getOutputCharset(),
@@ -1782,7 +1801,7 @@
output.beginRow();
output.beginCell(CssClass.OVERVIEW_SUMMARY_LEFT);
- output.beginAnchor(getPackageURL(packageDoc) + "/package-summary" + filenameExtension);
+ output.beginAnchor(getPackageURL(packageDoc) + "package-summary" + filenameExtension);
output.print(packageDoc.name());
output.endAnchor();
output.endCell();
@@ -2056,48 +2075,50 @@
else {
needSep = true;
- LinkedList superClasses = new LinkedList();
- for (ClassDoc cd = classDoc; cd != null; cd = cd.superclass()) {
- superClasses.add(cd);
- }
- output.beginDiv(CssClass.CLASS_INHERITANCETREE);
- output.beginElement("ul", new String[] { "class" }, new String[] { "inheritance 0" });
- printSuperTreeRec(output, superClasses.listIterator(superClasses.size()), 0);
- output.endElement("ul");
- output.endDiv(CssClass.CLASS_INHERITANCETREE);
-
- if (null != classDoc.containingClass()) {
- output.beginDiv(CssClass.CLASS_ENCLOSINGCLASS);
- output.div(CssClass.CLASS_ENCLOSINGCLASS_HEADER, "Enclosing Class:");
- output.beginDiv(CssClass.CLASS_ENCLOSINGCLASS_ITEM);
- printType(output, classDoc.containingClass());
- output.endDiv(CssClass.CLASS_ENCLOSINGCLASS_ITEM);
- output.endDiv(CssClass.CLASS_ENCLOSINGCLASS);
- }
-
- Set implementedInterfaces = getImplementedInterfaces(classDoc);
-
- printCommaSeparatedTypes(output,
- implementedInterfaces,
- "Implemented Interfaces:",
- CssClass.CLASS_KNOWNIMPLEMENTING);
-
-
- List knownDirectSubclasses = getKnownDirectSubclasses(classDoc);
- if (!knownDirectSubclasses.isEmpty()) {
- output.beginDiv(CssClass.CLASS_SUBCLASSES);
- output.div(CssClass.CLASS_SUBCLASSES_HEADER, "Known Direct Subclasses:");
- output.beginDiv(CssClass.CLASS_SUBCLASSES_ITEM);
- Iterator it = knownDirectSubclasses.iterator();
- while (it.hasNext()) {
- printType(output, (ClassDoc)it.next());
- if (it.hasNext()) {
- output.print(", ");
+ if (!"java.lang.Object".equals(classDoc.qualifiedName())) {
+ LinkedList superClasses = new LinkedList();
+ for (ClassDoc cd = classDoc; cd != null; cd = cd.superclass()) {
+ superClasses.add(cd);
+ }
+ output.beginDiv(CssClass.CLASS_INHERITANCETREE);
+ output.beginElement("ul", new String[] { "class" }, new String[] { "inheritance 0" });
+ printSuperTreeRec(output, superClasses.listIterator(superClasses.size()), 0);
+ output.endElement("ul");
+ output.endDiv(CssClass.CLASS_INHERITANCETREE);
+
+ if (null != classDoc.containingClass()) {
+ output.beginDiv(CssClass.CLASS_ENCLOSINGCLASS);
+ output.div(CssClass.CLASS_ENCLOSINGCLASS_HEADER, "Enclosing Class:");
+ output.beginDiv(CssClass.CLASS_ENCLOSINGCLASS_ITEM);
+ printType(output, classDoc.containingClass());
+ output.endDiv(CssClass.CLASS_ENCLOSINGCLASS_ITEM);
+ output.endDiv(CssClass.CLASS_ENCLOSINGCLASS);
+ }
+
+ Set implementedInterfaces = getImplementedInterfaces(classDoc);
+
+ printCommaSeparatedTypes(output,
+ implementedInterfaces,
+ "Implemented Interfaces:",
+ CssClass.CLASS_KNOWNIMPLEMENTING);
+
+ List knownDirectSubclasses = getKnownDirectSubclasses(classDoc);
+ if (!knownDirectSubclasses.isEmpty()) {
+ output.beginDiv(CssClass.CLASS_SUBCLASSES);
+ output.div(CssClass.CLASS_SUBCLASSES_HEADER, "Known Direct Subclasses:");
+ output.beginDiv(CssClass.CLASS_SUBCLASSES_ITEM);
+ Iterator it = knownDirectSubclasses.iterator();
+ while (it.hasNext()) {
+ printType(output, (ClassDoc)it.next());
+ if (it.hasNext()) {
+ output.print(", ");
+ }
}
+
+ output.endDiv(CssClass.CLASS_SUBCLASSES_ITEM);
+ output.endDiv(CssClass.CLASS_SUBCLASSES_HEADER);
+ output.endDiv(CssClass.CLASS_SUBCLASSES);
}
- output.endDiv(CssClass.CLASS_SUBCLASSES_ITEM);
- output.endDiv(CssClass.CLASS_SUBCLASSES_HEADER);
- output.endDiv(CssClass.CLASS_SUBCLASSES);
}
}
@@ -2166,18 +2187,6 @@
boolean haveInheritedMethods = false;
boolean haveInheritedClasses = false;
{
- Iterator it = implementedInterfaces.iterator();
- while (it.hasNext() && !haveInheritedClasses) {
- ClassDoc implementedInterface
- = (ClassDoc)it.next();
- if (!"java.io.Serializable".equals(implementedInterface.qualifiedName())
- && !"java.io.Externalizable".equals(implementedInterface.qualifiedName())) {
- if (implementedInterface.innerClasses().length > 0) {
- haveInheritedClasses = true;
- }
- }
- }
-
if (!classDoc.isInterface()) {
ClassDoc superClassDoc = classDoc.superclass();
while (null != superClassDoc
@@ -2533,6 +2542,7 @@
}
ClassDoc overriddenClassDoc = null;
+ MemberDoc specifyingSuperMethod = null;
for (ClassDoc superclassDoc = memberDoc.containingClass().superclass();
null != superclassDoc && null == overriddenClassDoc;
@@ -2543,6 +2553,7 @@
if (methods[j].name().equals(memberDoc.name())
&& methods[j].signature().equals(((MethodDoc)memberDoc).signature())) {
overriddenClassDoc = superclassDoc;
+ specifyingSuperMethod = methods[j];
break;
}
}
@@ -2553,7 +2564,11 @@
output.div(CssClass.MEMBER_DETAIL_OVERRIDDEN_HEADER, "Overrides:");
output.beginDiv(CssClass.MEMBER_DETAIL_OVERRIDDEN_ITEM);
- output.print(memberDoc.name() + " in interface ");
*** Patch too long, truncated ***
More information about the kaffe
mailing list