Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/gjdoc/ChangeLog,v
retrieving revision 1.13
diff -u -r1.13 ChangeLog
--- ChangeLog	4 Oct 2004 09:06:09 -0000	1.13
+++ ChangeLog	10 Oct 2004 22:38:00 -0000
@@ -1,3 +1,22 @@
+2004-10-11  Arnaud Vandyck <address@hidden>
+
+	* src/gnu/classpath/tools/gjdoc/ClassDocProxy: removed unnecessary
+	assignation (see patch#1964 at Savannah's cp-tools project).
+	* src/gnu/classpath/tools/gjdoc/Main.java: avoid the NPE with
+	-help argument (see patch#2333 at Savannah's cp-tools
+	project). The patch applied was the one from Nektarios
+	K. Papadopoulos (see patch#3079).
+	* src/gnu/classpath/tools/gjdoc/SerialFieldTagImpl: added not null
+	test against fieldName, fieldType and description.
+	* src/resources/doctranslets/html/allclasses.xsl, allpackages.xsl,
+	classdoc.xsl, descriptor.xsl, doctranslet.xsl, fulltree.xsl,
+	gjdoc.xsl, index.xsl, index_noframes.xsl, packageclasses.xsl,
+	packagedoc.xsl: I18n patch by Takashi Okamoto (see patch#3013 at
+	Savannah's cp-tools project) (it's utf-8, not utf8).
+	* src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java:
+	(apply) Handle system boot class loader (see patch#3078 at
+	Savannah's cp-tools project).
+	
 2004-10-04  Alex Lancaster  <alexl AT gnu.org>
 
 	* README: Update URL for project to point to classpath and note
Index: src/gnu/classpath/tools/gjdoc/ClassDocProxy.java
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/gnu/classpath/tools/gjdoc/ClassDocProxy.java,v
retrieving revision 1.4
diff -u -r1.4 ClassDocProxy.java
--- src/gnu/classpath/tools/gjdoc/ClassDocProxy.java	10 May 2002 00:33:45 -0000	1.4
+++ src/gnu/classpath/tools/gjdoc/ClassDocProxy.java	10 Oct 2004 22:38:01 -0000
@@ -34,7 +34,6 @@
    public ClassDocProxy(String qualifiedName, ClassDoc classContext) {
       this.qualifiedName=qualifiedName;
       this.classContext=classContext;
-      this.dimension=dimension;
       int pndx=qualifiedName.lastIndexOf('.');
       if (pndx>=0) {
 	 this.name=qualifiedName.substring(pndx+1);
Index: src/gnu/classpath/tools/gjdoc/Main.java
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/gnu/classpath/tools/gjdoc/Main.java,v
retrieving revision 1.22
diff -u -r1.22 Main.java
--- src/gnu/classpath/tools/gjdoc/Main.java	9 Mar 2003 23:24:33 -0000	1.22
+++ src/gnu/classpath/tools/gjdoc/Main.java	10 Oct 2004 22:38:03 -0000
@@ -537,6 +537,9 @@
       List customOptions=new LinkedList();
 
 
+      rootDoc = new RootDocImpl();
+      reporter = rootDoc.getReporter();
+
       //--- Iterate over all options given on the command line
 
       for (Iterator it = arguments.iterator(); it.hasNext(); ) {
@@ -556,29 +559,33 @@
 	 }
 
 	 //--- Otherwise the option is recognized as a standard option.
-	 //         If the option requires more arguments than given on the
-	 //         command line, issue a fatal error
-
-	 else if (!it.hasNext()) {
-	    reporter.printFatal("Missing value for option "+arg+".");
-	 }
-
-	 //--- The option is recognized as standard option, and all
-	 //         required arguments are supplied. Create a new String
+	 //         if all required arguments are supplied. Create a new String
 	 //         array for the option and its arguments, and store it
 	 //         in the options array.
 
-	 //         FIXME: this does not deal well with omitted arguments
-	 //         like such '-sourcepath -private': this would lead
-	 //         to '-private' being silently accepted as an argument
-	 //         to '-sourcepath'.
-
 	 else {
 	    String[] option=new String[optlen];
 	    option[0] = arg;
-	    for (int j=1; j<optlen; ++j)
-	       option[j] = (String)it.next();
-	    options.add(option);
+	    boolean optargs_ok = true;
+	    for (int j=1; j<optlen && optargs_ok; ++j) {
+	 	if (it.hasNext()) {
+	 		option[j] = (String)it.next();
+			if (option[j].startsWith("-")) {
+				optargs_ok = false;
+			}
+		}
+		else {
+			optargs_ok = false;
+		}
+	    }
+	    if (optargs_ok)
+	    	options.add(option);
+	    else {
+	 	//         If the option requires more arguments than given on the
+	 	//         command line, issue a fatal error
+
+	    	reporter.printFatal("Missing value for option "+arg+".");
+	    }
 	 }
       }
 
@@ -587,9 +594,6 @@
       String[][] optionArr=(String[][])options.toArray(new String[options.size()][0]);
 
       //--- Validate all options and issue warnings/errors
-
-      rootDoc = new RootDocImpl();
-      reporter = rootDoc.getReporter();
       
       if (validOptions(optionArr, rootDoc)) {
 
Index: src/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java,v
retrieving revision 1.2
diff -u -r1.2 SerialFieldTagImpl.java
--- src/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java	9 May 2002 12:59:54 -0000	1.2
+++ src/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java	10 Oct 2004 22:38:03 -0000
@@ -36,6 +36,13 @@
       super(text);
       this.contextClass=contextClass;
 
+      if (fieldName==null)
+        fieldName="";
+      if (fieldType==null)
+        fieldType="";
+      if (description==null)
+        description="";
+
       int state=1;
       char[] textArr=text.toCharArray();
       for (int i=0; i<textArr.length; ++i) {
Index: src/resources/doctranslets/html/allclasses.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/allclasses.xsl,v
retrieving revision 1.1
diff -u -r1.1 allclasses.xsl
--- src/resources/doctranslets/html/allclasses.xsl	7 Mar 2003 14:52:47 -0000	1.1
+++ src/resources/doctranslets/html/allclasses.xsl	10 Oct 2004 22:38:03 -0000
@@ -33,7 +33,7 @@
   <xsl:include href="html_common.xsl"/>
 
   <xsl:output method="xml"
-    encoding="UTF8"
+    encoding="utf-8"
     indent="no"/>
 
   <xsl:strip-space elements="*"/>
Index: src/resources/doctranslets/html/allpackages.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/allpackages.xsl,v
retrieving revision 1.1
diff -u -r1.1 allpackages.xsl
--- src/resources/doctranslets/html/allpackages.xsl	7 Mar 2003 14:52:47 -0000	1.1
+++ src/resources/doctranslets/html/allpackages.xsl	10 Oct 2004 22:38:03 -0000
@@ -33,7 +33,7 @@
   <xsl:include href="html_common.xsl"/>
 
   <xsl:output method="xml"
-    encoding="UTF8"
+    encoding="utf-8"
     indent="no"/>
 
   <xsl:strip-space elements="*"/>
Index: src/resources/doctranslets/html/classdoc.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/classdoc.xsl,v
retrieving revision 1.1
diff -u -r1.1 classdoc.xsl
--- src/resources/doctranslets/html/classdoc.xsl	7 Mar 2003 14:52:47 -0000	1.1
+++ src/resources/doctranslets/html/classdoc.xsl	10 Oct 2004 22:38:06 -0000
@@ -33,7 +33,7 @@
   <xsl:include href="html_common.xsl"/>
 
   <xsl:output method="html"
-    encoding="iso-8859-1"
+    encoding="utf-8"
     indent="no"/>
 
   <xsl:strip-space elements="*"/>
Index: src/resources/doctranslets/html/descriptor.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/descriptor.xsl,v
retrieving revision 1.1
diff -u -r1.1 descriptor.xsl
--- src/resources/doctranslets/html/descriptor.xsl	7 Mar 2003 14:52:47 -0000	1.1
+++ src/resources/doctranslets/html/descriptor.xsl	10 Oct 2004 22:38:06 -0000
@@ -34,7 +34,7 @@
   <xsl:include href="html_common.xsl"/>
 
   <xsl:output method="xml"
-    encoding="UTF8"
+    encoding="utf-8"
     indent="no"/>
 
   <xsl:strip-space elements="*"/>
Index: src/resources/doctranslets/html/doctranslet.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/doctranslet.xsl,v
retrieving revision 1.2
diff -u -r1.2 doctranslet.xsl
--- src/resources/doctranslets/html/doctranslet.xsl	7 Mar 2003 15:07:01 -0000	1.2
+++ src/resources/doctranslets/html/doctranslet.xsl	10 Oct 2004 22:38:07 -0000
@@ -31,7 +31,7 @@
   xmlns="http://www.gnu.org/software/cp-tools/gjdocxslfiles">
 
   <xsl:output method="xml"
-    encoding="utf8"
+    encoding="utf-8"
     indent="no"/>
 
   <xsl:strip-space elements="*"/>
Index: src/resources/doctranslets/html/fulltree.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/fulltree.xsl,v
retrieving revision 1.1
diff -u -r1.1 fulltree.xsl
--- src/resources/doctranslets/html/fulltree.xsl	7 Mar 2003 14:52:47 -0000	1.1
+++ src/resources/doctranslets/html/fulltree.xsl	10 Oct 2004 22:38:07 -0000
@@ -33,7 +33,7 @@
   <xsl:include href="html_common.xsl"/>
 
   <xsl:output method="xml"
-    encoding="UTF8"
+    encoding="utf-8"
     indent="no"/>
 
   <xsl:strip-space elements="*"/>
Index: src/resources/doctranslets/html/gjdoc.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/gjdoc.xsl,v
retrieving revision 1.1
diff -u -r1.1 gjdoc.xsl
--- src/resources/doctranslets/html/gjdoc.xsl	7 Mar 2003 14:52:47 -0000	1.1
+++ src/resources/doctranslets/html/gjdoc.xsl	10 Oct 2004 22:38:07 -0000
@@ -31,7 +31,7 @@
   xmlns="http://www.gnu.org/software/cp-tools/gjdocxslfiles">
 
   <xsl:output method="xml"
-    encoding="UTF8"
+    encoding="utf-8"
     indent="no"/>
 
   <xsl:strip-space elements="*"/>
Index: src/resources/doctranslets/html/index.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/index.xsl,v
retrieving revision 1.1
diff -u -r1.1 index.xsl
--- src/resources/doctranslets/html/index.xsl	7 Mar 2003 14:52:47 -0000	1.1
+++ src/resources/doctranslets/html/index.xsl	10 Oct 2004 22:38:08 -0000
@@ -34,7 +34,7 @@
   <xsl:include href="html_common.xsl"/>
 
   <xsl:output method="html"
-    encoding="ISO-8859-1"
+    encoding="utf-8"
     doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
     doctype-system="http://www.w3.org/TR/html4/loose.dtd"
     indent="no"/>
Index: src/resources/doctranslets/html/index_noframes.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/index_noframes.xsl,v
retrieving revision 1.1
diff -u -r1.1 index_noframes.xsl
--- src/resources/doctranslets/html/index_noframes.xsl	7 Mar 2003 14:52:47 -0000	1.1
+++ src/resources/doctranslets/html/index_noframes.xsl	10 Oct 2004 22:38:08 -0000
@@ -34,7 +34,7 @@
   <xsl:include href="html_common.xsl"/>
 
   <xsl:output method="xml"
-    encoding="iso-8859-1"
+    encoding="utf-8"
     indent="no"/>
 
   <xsl:strip-space elements="*"/>
Index: src/resources/doctranslets/html/packageclasses.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/packageclasses.xsl,v
retrieving revision 1.1
diff -u -r1.1 packageclasses.xsl
--- src/resources/doctranslets/html/packageclasses.xsl	7 Mar 2003 14:52:47 -0000	1.1
+++ src/resources/doctranslets/html/packageclasses.xsl	10 Oct 2004 22:38:09 -0000
@@ -33,7 +33,7 @@
   <xsl:include href="html_common.xsl"/>
 
   <xsl:output method="xml"
-    encoding="UTF8"
+    encoding="utf-8"
     indent="no"/>
 
   <xsl:strip-space elements="*"/>
Index: src/resources/doctranslets/html/packagedoc.xsl
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/resources/doctranslets/html/packagedoc.xsl,v
retrieving revision 1.2
diff -u -r1.2 packagedoc.xsl
--- src/resources/doctranslets/html/packagedoc.xsl	10 Mar 2003 19:30:20 -0000	1.2
+++ src/resources/doctranslets/html/packagedoc.xsl	10 Oct 2004 22:38:09 -0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <!-- packagedoc.xsl
      Copyright (C) 2003 Free Software Foundation, Inc.
@@ -33,7 +33,7 @@
   <xsl:include href="html_common.xsl"/>
 
   <xsl:output method="xml"
-    encoding="UTF8"
+    encoding="utf-8"
     indent="no"/>
 
   <xsl:strip-space elements="*"/>