[kaffe] CVS kaffe (robilad): Resynced with gjdoc

Kaffe CVS cvs-commits at kaffe.org
Mon Mar 21 20:25:08 PST 2005


PatchSet 5587 
Date: 2005/03/22 04:20:22
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with gjdoc

Members: 
	ChangeLog:1.3760->1.3761 
	Makefile.in:1.207->1.208 
	configure:1.437->1.438 
	configure.ac:1.127->1.128 
	kaffe/scripts/javadoc.in:1.8->1.9 
	kaffe/scripts/compat/javadoc.in:1.9->1.10 
	m4/ac_prog_antlr.m4:1.3->1.4 
	tools/gjdoc/javalib/Makefile.am:1.13->1.14 
	tools/gjdoc/javalib/Makefile.in:1.48->1.49 
	tools/gjdoc/javalib/version.properties.in:INITIAL->1.1 
	tools/gjdoc/javalib/gnu/classpath/tools/MalformedInputEvent.java:1.1->1.2 
	tools/gjdoc/javalib/gnu/classpath/tools/NotifyingInputStreamReader.java:1.2->1.3 
	tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java:1.5->1.6 
	tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/CssClass.java:1.5->1.6 
	tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:1.5->1.6 
	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocImpl.java:1.4->1.5 
	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java:1.4->1.5 
	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java:1.1->1.2 
	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/Main.java:1.7->1.8 
	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/Parser.java:1.6->1.7 
	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/RootDocImpl.java:1.4->1.5 
	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/SeeTagImpl.java:1.4->1.5 
	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/TagImpl.java:1.3->1.4 
	tools/gjdoc/javalib/gnu/classpath/tools/java2xhtml/Java2xhtml.java:1.4->1.5 
	tools/gjdoc/javalib/htmldoclet/gjdochtml-clean-layout.css:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3760 kaffe/ChangeLog:1.3761
--- kaffe/ChangeLog:1.3760	Tue Mar 22 00:20:02 2005
+++ kaffe/ChangeLog	Tue Mar 22 04:20:22 2005
@@ -1,5 +1,150 @@
 2005-03-22  Dalibor Topic  <robilad at kaffe.org>
 
+	* kaffe/scripts/compat/javadoc.in,
+	kaffe/scripts/compat/javadoc.in:
+	Added -Xmx512M to parameters used to invoke Kaffe to be able to 
+	deal with running javadoc on Kaffe's source tree out of the box.
+
+	* m4/m4/ac_prog_antlr.m4: Fixed antlr.jar test to bail out if 
+	no antlr.jar can be found.
+	
+	Resynced with gjdoc.
+	
+	2005-03-14  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/java2xhtml/Java2xhtml.java: Added
+	license boilerplate; updated copyright and license in usage
+	output.
+
+	2005-03-13  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/gjdoc/Main.java: Added method
+	execute(String, String[]) and commented-out empty shells for
+	additional execute methods.  Thanks to Jerry Haltom.
+	
+	2005-03-08  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/gjdoc/Main.java: add support for option
+	-reflection; disable reflection by default.
+
+	* src/gnu/classpath/tools/gjdoc/RootDocImpl.java: only use
+	reflection if enabled on command line.
+
+	2005-03-08  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java:
+	properly parse the thrown exception immediately preceding the
+	closing semicolon of an interface method declaration.
+
+	Reported by Robert Schuster
+
+	2005-03-04  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/gjdoc/SeeTagImpl.java: Removed bogus
+	Thread.dumpStack() invocation.
+
+	Reported by Arnaud Vandyck
+
+	* src/gnu/classpath/tools/gjdoc/Main.java: Pass DocErrorReporter
+	in reflected invocation of Doclet's validOptions() method.
+
+	Reported by Christopher Oezbek
+
+	2005-02-21  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java: fix
+	support for option -title.
+
+	2005-02-14  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/NotifyingInputStreamReader.java: fixed
+	bug #11989: ParseException with -encoding UTF-8.
+	
+	Reported by Kalle Olavi Niemitalo.
+
+	2005-02-11  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/NotifyingInputStreamReader.java:
+	correctly handle remaining undecoded bytes in the input buffer.
+
+	* src/gnu/classpath/tools/MalformedInputEvent.java: added
+	toString() method.
+
+	2005-02-11  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/gjdoc/Main.java: do not catch Throwable,
+	catch Exception instead so that Errors can fall through.
+
+	2005-02-11  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/gjdoc/Main.java: Also exit with return
+	code 1 if the doclet raised any errors.
+
+	2005-02-11  Michael Koch  <konqueror at gmx.de>
+
+	* src/gnu/classpath/tools/gjdoc/Main.java
+	(main): Fixed typo.
+
+	2005-02-11  Michael Koch  <konqueror at gmx.de>
+
+	* src/gnu/classpath/tools/gjdoc/Main.java
+	(main): Exit with return code of '1' of execution is failing.
+
+	2005-02-10  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:
+	fix private field access.
+
+	2005-02-10  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:
+	force generation of overview page if a single package is
+	documented and either -title, -doctitle or -overview has been
+	specified.
+
+	2005-02-10  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/gjdoc/Main.java: output warning when
+	option -classpath hasn't been interceptded at the wrapper level;
+	add -serialwarn and -nocomment to usage; better usage message for
+	-serialwarn.
+
+	* src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:
+	properly support optiosn -overview and -nocomment.  Replace option
+	-noserialwarn with -serialwarn.
+
+	* src/gnu/classpath/tools/doclets/htmldoclet/CssClass.java,
+	src/resources/htmldoclet/gjdochtml-clean-layout.css: add new style
+	for overview page.
+
+	2005-02-09  Julian Scheid  <julian at sektor37.de>
+
+	* m4/ac_prog_antlr.m4: if $ANTLR_JAR is set, use that for locating
+	antlr.jar; complain if $ANTLR_JAR specifies a non-existing file.
+
+	* configure.ac: set autoconf prerequisite version to 2.59; set
+	config macro directory; accept option --with-antlr-jar.
+
+	2005-02-08  Julian Scheid  <julian at sektor37.de>
+
+	* src/gnu/classpath/tools/doclets/AbstractDoclet.java:
+	* src/gnu/classpath/tools/gjdoc/ClassDocImpl.java:
+	* src/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java:
+	* src/gnu/classpath/tools/gjdoc/Parser.java:
+	* src/gnu/classpath/tools/gjdoc/RootDocImpl.java:
+	* src/gnu/classpath/tools/gjdoc/TagImpl.java:
+	refactor so that jikes doesn't warn anymore.
+
+	* src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:
+	* src/gnu/classpath/tools/doclets/htmldoclet/CssClass.java:
+	* src/resources/htmldoclet/gjdochtml-clean-layout.css:
+	some HTML output and CSS refactoring
+
+	* src/gnu/classpath/tools/java2xhtml/Java2xhtml.java:
+	s/numerical/numeric/g
+
+2005-03-22  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/classpath/VMSystemProperties.java (VMSystemProperties): 
 	Set build.compiler to jikes to allow out of the box Tomcat4 JSP examples to run.
 
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.207 kaffe/Makefile.in:1.208
--- kaffe/Makefile.in:1.207	Wed Mar 16 10:30:46 2005
+++ kaffe/Makefile.in	Tue Mar 22 04:20:23 2005
@@ -749,7 +749,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/binreloc $(distdir)/compat-include $(distdir)/developers $(distdir)/include/kaffe $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/libraries/javalib/gnu/classpath $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time
+	$(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/binreloc $(distdir)/compat-include $(distdir)/developers $(distdir)/include/kaffe $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/libraries/javalib/gnu/classpath $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time $(distdir)/tools/gjdoc/javalib
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
Index: kaffe/configure
diff -u kaffe/configure:1.437 kaffe/configure:1.438
--- kaffe/configure:1.437	Mon Mar 21 17:15:02 2005
+++ kaffe/configure	Tue Mar 22 04:20:24 2005
@@ -1177,6 +1177,8 @@
   --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)
   --with-xslt-prefix=PFX   Prefix where libxslt is installed (optional)
   --with-xslt-exec-prefix=PFX Exec prefix where libxslt is installed (optional)
+  --with-antlr-jar=file   Use ANTLR from the specified jar file. ANTLR is
+                          required for gjdoc
   --with-jni-library-path=dir
                           additional directories to search for native jni
                           libraries
@@ -10069,7 +10071,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 10072 "configure"' > conftest.$ac_ext
+  echo '#line 10074 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11426,7 +11428,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:11429:" \
+echo "$as_me:11431:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -12499,11 +12501,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12502: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12504: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12506: \$? = $ac_status" >&5
+   echo "$as_me:12508: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12754,11 +12756,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12757: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12759: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12761: \$? = $ac_status" >&5
+   echo "$as_me:12763: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12814,11 +12816,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12817: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12819: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12821: \$? = $ac_status" >&5
+   echo "$as_me:12823: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15018,7 +15020,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15021 "configure"
+#line 15023 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15116,7 +15118,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15119 "configure"
+#line 15121 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17340,11 +17342,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17343: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17345: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17347: \$? = $ac_status" >&5
+   echo "$as_me:17349: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17400,11 +17402,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17403: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17405: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17407: \$? = $ac_status" >&5
+   echo "$as_me:17409: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18767,7 +18769,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18770 "configure"
+#line 18772 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18865,7 +18867,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18868 "configure"
+#line 18870 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19720,11 +19722,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19723: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19725: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19727: \$? = $ac_status" >&5
+   echo "$as_me:19729: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -19780,11 +19782,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19783: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19785: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19787: \$? = $ac_status" >&5
+   echo "$as_me:19789: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21844,11 +21846,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21847: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21849: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21851: \$? = $ac_status" >&5
+   echo "$as_me:21853: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -22099,11 +22101,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:22102: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22104: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:22106: \$? = $ac_status" >&5
+   echo "$as_me:22108: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -22159,11 +22161,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:22162: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22164: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:22166: \$? = $ac_status" >&5
+   echo "$as_me:22168: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -24363,7 +24365,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 24366 "configure"
+#line 24368 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -24461,7 +24463,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 24464 "configure"
+#line 24466 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -51724,6 +51726,15 @@
 
 
 
+
+# Check whether --with-antlr-jar or --without-antlr-jar was given.
+if test "${with_antlr_jar+set}" = set; then
+  withval="$with_antlr_jar"
+   ANTLR_JAR=$withval
+else
+   ANTLR_JAR="$ANTLR_JAR"
+fi;
+
 # Check whether --enable-gjdoc or --disable-gjdoc was given.
 if test "${enable_gjdoc+set}" = set; then
   enableval="$enable_gjdoc"
@@ -51741,10 +51752,11 @@
                       ANTLR_JAR=$antlr_lib_home/antlr.jar
 	fi
   done
-  test -z $ANTLR_JAR && \
-        { { echo "$as_me:$LINENO: error: no suitable antlr.jar found for version 2.7.1" >&5
-echo "$as_me: error: no suitable antlr.jar found for version 2.7.1" >&2;}
-   { (exit 1); exit 1; }; }
+  test -f $ANTLR_JAR || { { echo "$as_me:$LINENO: error: specified ANTLR jar file $ANTLR_JAR not found." >&5
+echo "$as_me: error: specified ANTLR jar file $ANTLR_JAR not found." >&2;}
+   { (exit 1); exit 1; }; } \
+  	&& { echo "$as_me:$LINENO: using ANTLR parser generator in $ANTLR_JAR" >&5
+echo "$as_me: using ANTLR parser generator in $ANTLR_JAR" >&6;}
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -52646,6 +52658,8 @@
 
           ac_config_files="$ac_config_files tools/Makefile"
 
+          ac_config_files="$ac_config_files tools/gjdoc/javalib/version.properties"
+
           ac_config_files="$ac_config_files tools/gjdoc/Makefile"
 
           ac_config_files="$ac_config_files tools/gjdoc/javalib/Makefile"
@@ -53526,6 +53540,7 @@
   "kaffe/scripts/compat/javadoc" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/compat/javadoc" ;;
   "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
   "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+  "tools/gjdoc/javalib/version.properties" ) CONFIG_FILES="$CONFIG_FILES tools/gjdoc/javalib/version.properties" ;;
   "tools/gjdoc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/gjdoc/Makefile" ;;
   "tools/gjdoc/javalib/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/gjdoc/javalib/Makefile" ;;
   "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.127 kaffe/configure.ac:1.128
--- kaffe/configure.ac:1.127	Mon Mar 21 17:15:09 2005
+++ kaffe/configure.ac	Tue Mar 22 04:20:31 2005
@@ -2002,6 +2002,12 @@
 dnl Building of gjdoc
 dnl -------------------------------------------------------------------------
 
+AC_ARG_WITH([antlr-jar],
+            AS_HELP_STRING([--with-antlr-jar=file],
+                           [Use ANTLR from the specified jar file. ANTLR is required for gjdoc]),
+  [ ANTLR_JAR=$withval ],
+  [ ANTLR_JAR="$ANTLR_JAR" ])
+
 AC_ARG_ENABLE([gjdoc],
 		AS_HELP_STRING([--enable-gjdoc],
 				[Enable building of gjdoc]),
@@ -2306,6 +2312,7 @@
 AC_CONFIG_FILES([kaffe/scripts/compat/javadoc])
 AC_CONFIG_FILES([po/Makefile.in])
 AC_CONFIG_FILES([tools/Makefile])
+AC_CONFIG_FILES([tools/gjdoc/javalib/version.properties])
 AC_CONFIG_FILES([tools/gjdoc/Makefile])
 AC_CONFIG_FILES([tools/gjdoc/javalib/Makefile])
 AC_CONFIG_FILES([test/Makefile])
Index: kaffe/kaffe/scripts/javadoc.in
diff -u kaffe/kaffe/scripts/javadoc.in:1.8 kaffe/kaffe/scripts/javadoc.in:1.9
--- kaffe/kaffe/scripts/javadoc.in:1.8	Mon Feb  7 15:47:09 2005
+++ kaffe/kaffe/scripts/javadoc.in	Tue Mar 22 04:20:32 2005
@@ -3,6 +3,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 export CLASSPATH=$CLASSPATH:@ANTLR_JAR@:@prefix@/lib/gjdoc.jar
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS gnu.classpath.tools.gjdoc.Main ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ -Xmx512M $JAVA_OPTS gnu.classpath.tools.gjdoc.Main ${1+"$@"}
 exit $?
 
Index: kaffe/kaffe/scripts/compat/javadoc.in
diff -u kaffe/kaffe/scripts/compat/javadoc.in:1.9 kaffe/kaffe/scripts/compat/javadoc.in:1.10
--- kaffe/kaffe/scripts/compat/javadoc.in:1.9	Mon Feb  7 15:47:10 2005
+++ kaffe/kaffe/scripts/compat/javadoc.in	Tue Mar 22 04:20:32 2005
@@ -3,5 +3,5 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 export CLASSPATH=$CLASSPATH:@ANTLR_JAR@:@prefix@/lib/gjdoc.jar
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS gnu.classpath.tools.gjdoc.Main ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ -Xmx512M $JAVA_OPTS gnu.classpath.tools.gjdoc.Main ${1+"$@"}
 exit $?
Index: kaffe/m4/ac_prog_antlr.m4
diff -u kaffe/m4/ac_prog_antlr.m4:1.3 kaffe/m4/ac_prog_antlr.m4:1.4
--- kaffe/m4/ac_prog_antlr.m4:1.3	Mon Feb  7 15:47:35 2005
+++ kaffe/m4/ac_prog_antlr.m4	Tue Mar 22 04:20:32 2005
@@ -7,8 +7,8 @@
                       ANTLR_JAR=$antlr_lib_home/antlr.jar
 	fi
   done
-  test -z $ANTLR_JAR && \
-        AC_MSG_ERROR(no suitable antlr.jar found for version $1.$2.$3)
+  test -f $ANTLR_JAR || AC_MSG_ERROR([specified ANTLR jar file $ANTLR_JAR not found.]) \
+  	&& AC_MSG_NOTICE([using ANTLR parser generator in $ANTLR_JAR])
   AC_MSG_RESULT([yes])
   AC_SUBST(ANTLR_JAR)
   AC_PROVIDE([$0])dnl
Index: kaffe/tools/gjdoc/javalib/Makefile.am
diff -u kaffe/tools/gjdoc/javalib/Makefile.am:1.13 kaffe/tools/gjdoc/javalib/Makefile.am:1.14
--- kaffe/tools/gjdoc/javalib/Makefile.am:1.13	Mon Feb  7 15:47:43 2005
+++ kaffe/tools/gjdoc/javalib/Makefile.am	Tue Mar 22 04:20:33 2005
@@ -249,6 +249,7 @@
 
 JAR_CMD1 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new $(SRCDIRS))
 JAR_CMD2 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gjdoc_ressources))
+JAR_CMD3 = ($(ZIP) -q -DX -r $(CURDIR)/$@.new version.properties)
 
 LIBDIR = lib
 
@@ -277,6 +278,7 @@
 	rm -f $@ $@.new
 	$(JAR_CMD1)
 	$(JAR_CMD2)
+	$(JAR_CMD3)
 	mv $@.new $@
 
 export JIKES top_builddir LIBDIR srcdir
Index: kaffe/tools/gjdoc/javalib/Makefile.in
diff -u kaffe/tools/gjdoc/javalib/Makefile.in:1.48 kaffe/tools/gjdoc/javalib/Makefile.in:1.49
--- kaffe/tools/gjdoc/javalib/Makefile.in:1.48	Wed Mar 16 10:31:45 2005
+++ kaffe/tools/gjdoc/javalib/Makefile.in	Tue Mar 22 04:20:33 2005
@@ -46,7 +46,8 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = tools/gjdoc/javalib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/version.properties.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
 	$(top_srcdir)/m4/ac_prog_antlr.m4 \
@@ -72,7 +73,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config/config.h \
 	$(top_builddir)/include/kaffe/jni_md.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = version.properties
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -598,6 +599,7 @@
 
 JAR_CMD1 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/$@.new $(SRCDIRS))
 JAR_CMD2 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(gjdoc_ressources))
+JAR_CMD3 = ($(ZIP) -q -DX -r $(CURDIR)/$@.new version.properties)
 LIBDIR = lib
 rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
 Klasses_jar = $(top_srcdir)/libraries/javalib/rt.jar
@@ -633,6 +635,8 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+version.properties: $(top_builddir)/config.status $(srcdir)/version.properties.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -805,6 +809,7 @@
 	rm -f $@ $@.new
 	$(JAR_CMD1)
 	$(JAR_CMD2)
+	$(JAR_CMD3)
 	mv $@.new $@
 
 export JIKES top_builddir LIBDIR srcdir
===================================================================
Checking out kaffe/tools/gjdoc/javalib/version.properties.in
RCS:  /home/cvs/kaffe/kaffe/tools/gjdoc/javalib/version.properties.in,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/tools/gjdoc/javalib/version.properties.in	Tue Mar 22 04:25:08 2005
@@ -0,0 +1 @@
+gjdoc.version=@VERSION@
Index: kaffe/tools/gjdoc/javalib/gnu/classpath/tools/MalformedInputEvent.java
diff -u kaffe/tools/gjdoc/javalib/gnu/classpath/tools/MalformedInputEvent.java:1.1 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/MalformedInputEvent.java:1.2
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/MalformedInputEvent.java:1.1	Sat Dec 11 03:21:44 2004
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/MalformedInputEvent.java	Tue Mar 22 04:20:33 2005
@@ -82,4 +82,12 @@
    {
       return length;
    }
+
+   public String toString()
+   {
+      return "MalformedInputEvent{line=" + lineNumber
+         + ",column=" + columnNumber
+         + ",length=" + length
+         + "}";
+   }
 }
Index: kaffe/tools/gjdoc/javalib/gnu/classpath/tools/NotifyingInputStreamReader.java
diff -u kaffe/tools/gjdoc/javalib/gnu/classpath/tools/NotifyingInputStreamReader.java:1.2 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/NotifyingInputStreamReader.java:1.3
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/NotifyingInputStreamReader.java:1.2	Wed Dec 22 01:10:32 2004
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/NotifyingInputStreamReader.java	Tue Mar 22 04:20:33 2005
@@ -274,12 +274,20 @@
          }
          else if (coderResult.isUnderflow()) {
             if (!allInputConsumed) {
+               int nRemainingBytes = 0;
+               if (byteBuffer.position() > 0) {
+                  nRemainingBytes = Math.max(0, byteBuffer.limit() - byteBuffer.position());
+               }
+               if (nRemainingBytes > 0) {
+                  byteBuffer.get(readBuffer, 0, nRemainingBytes);
+               }
                byteBuffer.rewind();
-               int nread = in.read(readBuffer);
+               int nread = in.read(readBuffer, nRemainingBytes, 
+                                   readBuffer.length - nRemainingBytes);
                if (nread < 0) {
                   allInputConsumed = true;
                }
-               byteBuffer.limit(Math.max(0, nread));
+               byteBuffer.limit(nRemainingBytes + Math.max(0, nread));
             }
             else {
                break;
Index: kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java
diff -u kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java:1.5 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java:1.6
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java:1.5	Mon Feb  7 15:47:44 2005
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/AbstractDoclet.java	Tue Mar 22 04:20:33 2005
@@ -174,9 +174,9 @@
       for (int i=0, ilim=rootDoc.options().length; i<ilim; ++i) {
             
          String[] optionArr = rootDoc.options()[i];
-         String optionTag = optionArr[0];
+         String _optionTag = optionArr[0];
 
-         DocletOption option = (DocletOption)nameToOptionMap.get(optionTag);
+         DocletOption option = (DocletOption)nameToOptionMap.get(_optionTag);
 
          if (null != option) {
             option.set(optionArr);
@@ -789,7 +789,7 @@
     */
    private Map collectUsage() {
 
-      Map usedClassToPackagesMap = new HashMap();
+      Map _usedClassToPackagesMap = new HashMap();
 
       ClassDoc[] classes = rootDoc.classes();
       for (int i = 0, ilim = classes.length; i < ilim; ++ i) {
@@ -802,7 +802,7 @@
             Iterator it = relation.implementingClasses.iterator();
             while (it.hasNext()) {
                ClassDoc implementor = (ClassDoc)it.next();
-               addUsedBy(usedClassToPackagesMap,
+               addUsedBy(_usedClassToPackagesMap,
                          clazz, UsageType.CLASS_IMPLEMENTING, implementor, implementor.containingPackage());
             }
          }
@@ -810,7 +810,7 @@
             // classes derived from
             for (ClassDoc superclass = clazz.superclass(); superclass != null; 
                  superclass = superclass.superclass()) {
-               addUsedBy(usedClassToPackagesMap,
+               addUsedBy(_usedClassToPackagesMap,
                          superclass, UsageType.CLASS_DERIVED_FROM, clazz, clazz.containingPackage());
             }
          }
@@ -822,7 +822,7 @@
             // fields of type                  
             ClassDoc fieldType = field.type().asClassDoc();
             if (null != fieldType) {
-               addUsedBy(usedClassToPackagesMap,
+               addUsedBy(_usedClassToPackagesMap,
                          fieldType, UsageType.FIELD_OF_TYPE, 
                          field, clazz.containingPackage());
             }
@@ -836,7 +836,7 @@
 
             ClassDoc returnType = method.returnType().asClassDoc();
             if (null != returnType) {
-               addUsedBy(usedClassToPackagesMap,
+               addUsedBy(_usedClassToPackagesMap,
                          returnType, UsageType.METHOD_WITH_RETURN_TYPE, 
                          method, clazz.containingPackage());
             }
@@ -848,7 +848,7 @@
                Parameter parameter = parameters[k];
                ClassDoc parameterType = parameter.type().asClassDoc();
                if (null != parameterType) {
-                  addUsedBy(usedClassToPackagesMap,
+                  addUsedBy(_usedClassToPackagesMap,
                             parameterType, UsageType.METHOD_WITH_PARAMETER_TYPE, 
                             method, clazz.containingPackage());
                }
@@ -859,7 +859,7 @@
             ClassDoc[] thrownExceptions = method.thrownExceptions();
             for (int k = 0, klim = thrownExceptions.length; k < klim; ++ k) {
                ClassDoc thrownException = thrownExceptions[k];
-               addUsedBy(usedClassToPackagesMap,
+               addUsedBy(_usedClassToPackagesMap,
                          thrownException, UsageType.METHOD_WITH_THROWN_TYPE, 
                          method, clazz.containingPackage());
             }
@@ -878,7 +878,7 @@
                Parameter parameter = parameters[k];
                ClassDoc parameterType = parameter.type().asClassDoc();
                if (null != parameterType) {
-                  addUsedBy(usedClassToPackagesMap,
+                  addUsedBy(_usedClassToPackagesMap,
                             parameterType, UsageType.CONSTRUCTOR_WITH_PARAMETER_TYPE, 
                             constructor, clazz.containingPackage());
                }
@@ -889,23 +889,23 @@
             ClassDoc[] thrownExceptions = constructor.thrownExceptions();
             for (int k = 0, klim = thrownExceptions.length; k < klim; ++ k) {
                ClassDoc thrownException = thrownExceptions[k];
-               addUsedBy(usedClassToPackagesMap,
+               addUsedBy(_usedClassToPackagesMap,
                          thrownException, UsageType.CONSTRUCTOR_WITH_THROWN_TYPE, 
                          constructor, clazz.containingPackage());
             }
          }
       }
-      return usedClassToPackagesMap;
+      return _usedClassToPackagesMap;
    }
 
-   Map usedClassToPackagesMap = null;
+   private Map usedClassToPackagesMap = null;
 
    protected Map getUsageOfClass(ClassDoc classDoc)
    {
       if (null == this.usedClassToPackagesMap) {
          this.usedClassToPackagesMap = collectUsage();
       }
-      return (Map)usedClassToPackagesMap.get(classDoc);
+      return (Map)this.usedClassToPackagesMap.get(classDoc);
    }
 
    protected static class UsageType
Index: kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/CssClass.java
diff -u kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/CssClass.java:1.5 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/CssClass.java:1.6
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/CssClass.java:1.5	Mon Feb  7 15:47:45 2005
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/CssClass.java	Tue Mar 22 04:20:34 2005
@@ -43,8 +43,10 @@
 
    public static final CssClass OVERVIEW_TITLE = new CssClass("overview title", "h1");
    public static final CssClass OVERVIEW_SUMMARY = new CssClass("overview summary");
-   public static final CssClass OVERVIEW_SUMMARY_LEFT = new CssClass("overview summary left");
-   public static final CssClass OVERVIEW_SUMMARY_RIGHT = new CssClass("overview summary right");
+   public static final CssClass OVERVIEW_SUMMARY_LEFT = new CssClass("left");
+   public static final CssClass OVERVIEW_SUMMARY_RIGHT = new CssClass("right");
+   public static final CssClass OVERVIEW_DESCRIPTION_TOP = new CssClass("overview description top");
+   public static final CssClass OVERVIEW_DESCRIPTION_FULL = new CssClass("overview description full");
 
    public static final CssClass DEPRECATION_TITLE = new CssClass("deprecation title", "h1");
    public static final CssClass DEPRECATION_SUMMARY = new CssClass("summary");
@@ -63,12 +65,13 @@
    public static final CssClass SERIALIZED_SVUID_OUTER = new CssClass("serialized svuid outer", "p");
    public static final CssClass SERIALIZED_SVUID_HEADER = new CssClass("serialized svuid header", "b");
    public static final CssClass SERIALIZED_SVUID_VALUE = new CssClass("serialized svuid header");
+   public static final CssClass SERIALIZED_SECTION = new CssClass("serialized section");
    public static final CssClass SERIALIZED_SECTION_HEADER = new CssClass("serialized section header", "h4");
 
    public static final CssClass PACKAGE_TITLE = new CssClass("package title", "h1");
    public static final CssClass PACKAGE_SUMMARY = new CssClass("package summary");
-   public static final CssClass PACKAGE_SUMMARY_LEFT = new CssClass("package summary left");
-   public static final CssClass PACKAGE_SUMMARY_RIGHT = new CssClass("package summary right");
+   public static final CssClass PACKAGE_SUMMARY_LEFT = new CssClass("left");
+   public static final CssClass PACKAGE_SUMMARY_RIGHT = new CssClass("right");
    public static final CssClass PACKAGE_DESCRIPTION_TOP = new CssClass("package description top");
    public static final CssClass PACKAGE_DESCRIPTION_FULL = new CssClass("package description full");
    public static final CssClass PACKAGE_TREE_TITLE = new CssClass("package tree title", "h1");
@@ -121,13 +124,13 @@
    public static final CssClass CLASS_SYNOPSIS_IMPLEMENTS = new CssClass("class synopsis implements", "div", "code");
    public static final CssClass CLASS_DESCRIPTION = new CssClass("class description");
    public static final CssClass CLASS_SUMMARY = new CssClass("class summary");
-   public static final CssClass CLASS_SUMMARY_LEFT = new CssClass("class summary left", new String[] { "valign" }, new String[] { "top" });
-   public static final CssClass CLASS_SUMMARY_LEFT_SYNOPSIS = new CssClass("class summary left synopsis", "code");
-   public static final CssClass CLASS_SUMMARY_RIGHT = new CssClass("class summary right");
-   public static final CssClass CLASS_SUMMARY_RIGHT_LIST = new CssClass("class summary right list", "dl");
-   public static final CssClass CLASS_SUMMARY_RIGHT_SYNOPSIS = new CssClass("class summary right synopsis", "dt", "code");
-   public static final CssClass CLASS_SUMMARY_RIGHT_DESCRIPTION = new CssClass("class summary right description", "dd");
-   public static final CssClass CLASS_SUMMARY_INHERITED = new CssClass("class summary inherited");
+   public static final CssClass CLASS_SUMMARY_LEFT = new CssClass("left", new String[] { "valign" }, new String[] { "top" });
+   public static final CssClass CLASS_SUMMARY_LEFT_SYNOPSIS = new CssClass("synopsis", "code");
+   public static final CssClass CLASS_SUMMARY_RIGHT = new CssClass("right");
+   public static final CssClass CLASS_SUMMARY_RIGHT_LIST = new CssClass("list", "dl");
+   public static final CssClass CLASS_SUMMARY_RIGHT_SYNOPSIS = new CssClass("synopsis", "dt", "code");
+   public static final CssClass CLASS_SUMMARY_RIGHT_DESCRIPTION = new CssClass("description", "dd");
+   public static final CssClass CLASS_SUMMARY_INHERITED = new CssClass("inherited");
    public static final CssClass CLASS_SUMMARY_INHERITED_MEMBER = new CssClass("member", "code");
    public static final CssClass CLASS_BOILERPLATE = new CssClass("boilerplate", "pre", new String[] { "style" }, new String[] { "font-size: x-small;" });
 
@@ -135,8 +138,8 @@
    public static final CssClass USAGE_PACKAGE_TITLE = new CssClass("usage package title", "h2");
    public static final CssClass USAGE_USAGE_TITLE = new CssClass("usage usage title", "h3");
    public static final CssClass USAGE_SUMMARY = new CssClass("usage summary");
-   public static final CssClass USAGE_SUMMARY_LEFT = new CssClass("usage summary left");
-   public static final CssClass USAGE_SUMMARY_RIGHT = new CssClass("usage summary right");
+   public static final CssClass USAGE_SUMMARY_LEFT = new CssClass("left");
+   public static final CssClass USAGE_SUMMARY_RIGHT = new CssClass("right");
    public static final CssClass USAGE_SUMMARY_SYNOPSIS = new CssClass("synopsis");
    public static final CssClass USAGE_SUMMARY_DESCRIPTION = new CssClass("description");
    public static final CssClass USAGE_TABLE_HEADER = new CssClass("table header", "h3");
@@ -173,10 +176,11 @@
    public static final CssClass TABLE_SUB_HEADER = new CssClass("table sub header", "h3");
    public static final CssClass TABLE_CONTAINER = new CssClass("table container", "dl");
 
+   public static final CssClass SECTION = new CssClass("section", "div");
    public static final CssClass SECTION_HEADER = new CssClass("section header", "h2");
 
    public static final CssClass NAVBAR_TOP = new CssClass("navbar div top", new String[] { "colspan" }, new String[] { "2" });
-   public static final CssClass NAVBAR_TOP_NAVI = new CssClass("navbar div top navi");
+   public static final CssClass NAVBAR_TOP_NAVI = new CssClass("navi");
    public static final CssClass NAVBAR_TOP_HEADER = new CssClass("header", new String[] { "rowspan" }, new String[] { "2" });
    public static final CssClass NAVBAR_BOTTOM = new CssClass("navbar div bottom");
    public static final CssClass NAVBAR_BOTTOM_SPACER = new CssClass("navbar bottom spacer", "p");
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.5 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:1.6
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java:1.5	Mon Feb  7 15:47:45 2005
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java	Tue Mar 22 04:20:34 2005
@@ -946,7 +946,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");
@@ -1732,11 +1732,9 @@
          output.div(CssClass.OVERVIEW_TITLE, overviewHeader);
       }
 
-      /*
-      output.beginDiv(CssClass.PACKAGE_DESCRIPTION_TOP);
-      printTags(output, packageDoc.firstSentenceTags(), true);
-      output.endDiv(CssClass.PACKAGE_DESCRIPTION_TOP);
-      */
+      output.beginDiv(CssClass.OVERVIEW_DESCRIPTION_TOP);
+      printTags(output, getRootDoc(), getRootDoc().firstSentenceTags(), true);
+      output.endDiv(CssClass.OVERVIEW_DESCRIPTION_TOP);
 
       List packageGroups = getPackageGroups();
 
@@ -1765,12 +1763,10 @@
          }
       }
 
-      /*
       output.anchorName("description");
-      output.beginDiv(CssClass.PACKAGE_DESCRIPTION_FULL);
-      printTags(output, packageDoc.inlineTags(), false);
-      output.endDiv(CssClass.PACKAGE_DESCRIPTION_FULL);
-      */
+      output.beginDiv(CssClass.OVERVIEW_DESCRIPTION_FULL);
+      printTags(output, getRootDoc(), getRootDoc().inlineTags(), false);
+      output.endDiv(CssClass.OVERVIEW_DESCRIPTION_FULL);
 
       printNavBarBottom(output, "overview");
       output.endBody();
@@ -2369,13 +2365,17 @@
          }
 
          CssClass sectionClass;
+         CssClass headerClass;
          if (isOnSerializedPage) {
-            sectionClass = CssClass.SERIALIZED_SECTION_HEADER;
+            sectionClass = CssClass.SERIALIZED_SECTION;
+            headerClass = CssClass.SERIALIZED_SECTION_HEADER;
          }
          else {
-            sectionClass = CssClass.SECTION_HEADER;
+            sectionClass = CssClass.SECTION;
+            headerClass = CssClass.SECTION_HEADER;
          }
-         output.div(sectionClass, header);
+         output.div(headerClass, header);
+         output.beginDiv(sectionClass);
 
          for (int i=0; i<memberDocs.length; ++i) {
             if (i>0) {
@@ -2677,6 +2677,7 @@
             output.endDiv(CssClass.MEMBER_DETAIL_BODY);
             output.endDiv(CssClass.MEMBER_DETAIL);
          }
+         output.endDiv(sectionClass);
       }
    }
 
@@ -2798,7 +2799,10 @@
 
    private void printTags(HtmlPage output, Doc contextDoc, Tag[] tags, boolean firstSentence, boolean inline)
    {
-      output.print(renderInlineTags(tags, new HtmlTagletContext(contextDoc, output, false)));
+      if (!optionNoComment.getValue()) {
+         output.print(renderInlineTags(tags, new HtmlTagletContext(contextDoc, output, false)));
+      }
+
       /*
       if (!optionNoComment.getValue()) {
          output.print(renderInlineTags(tag.firstSentenceTags(), output));
@@ -2924,8 +2928,8 @@
    protected void run()
       throws DocletConfigurationException, IOException
    {
-      if (optionNoSerialWarn.getValue()) {
-         printWarning("option -noserialwarn is currently ignored.");
+      if (optionSerialWarn.getValue()) {
+         printWarning("option -serialwarn is currently ignored.");
       }
 
       if (null != optionTitle.getValue()) {
@@ -3223,8 +3227,8 @@
    private DocletOptionFlag optionNoComment = 
      new DocletOptionFlag("-nocomment");
 
-   private DocletOptionFlag optionNoSerialWarn = 
-     new DocletOptionFlag("-noserialwarn");
+   private DocletOptionFlag optionSerialWarn = 
+     new DocletOptionFlag("-serialwarn");
 
    private DocletOptionFlag optionSplitIndex = 
      new DocletOptionFlag("-splitindex");
@@ -3315,6 +3319,7 @@
          optionStylesheetFile,
          optionWindowTitle,
          optionDocTitle,
+         optionTitle,
          optionLinkSource,
          optionLink,
          optionLinkOffline,
@@ -3606,5 +3611,19 @@
          sheets.put("GNU Clean", cleanSheets.toArray(new String[0]));
       }
       return sheets;
+   }
+
+   protected boolean isSinglePackage()
+   {
+      if (getRootDoc().firstSentenceTags().length > 0) {
+         return false;
+      }
+      else if (null != optionDocTitle.getValue() 
+               || null != optionTitle.getValue()) {
+         return false;
+      }
+      else {
+         return super.isSinglePackage();
+      }
    }
 }
Index: kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocImpl.java
diff -u kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocImpl.java:1.4 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocImpl.java:1.5
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocImpl.java:1.4	Wed Dec 22 01:10:34 2004
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocImpl.java	Tue Mar 22 04:20:34 2005
@@ -122,68 +122,6 @@
       return rc;
    }
 
-
-   /**

*** Patch too long, truncated ***




More information about the kaffe mailing list