Index: ChangeLog
===================================================================
RCS file: /cvsroot/cp-tools/gjdoc/ChangeLog,v
retrieving revision 1.2
diff -u -r1.2 ChangeLog
--- ChangeLog	6 Oct 2002 23:26:59 -0000	1.2
+++ ChangeLog	26 Nov 2002 10:47:21 -0000
@@ -1,3 +1,21 @@
+2002-11-26  Ross Burton  <address@hidden>
+
+	* src/gnu/classpath/tools/gjdoc/Main.java (initOptions): Throw an
+	exception if a sourcepath does not exist.
+
+	* src/gnu/classpath/tools/gjdoc/Parser.java (match): Allow no
+	whitespace between "static" and "{".
+
+	* src/gnu/classpath/tools/gjdoc/Debug.java (Debug): Take the
+	'final' modifier of the commented out logLevel, so that just
+	uncommenting it works.
+
+	* src/gnu/classpath/tools/doclets/xmldoclet/Driver.java: Handle
+	ProgramElements with private scope.
+
+	* bin/gjdocxml2html.sh: Add a missing \ to the end of a line, so
+	that the script runs correctly.
+
 2002-10-06  Alex Lancaster  <address@hidden>
 
 	* bin/gjdocxml2html.sh: Skip DTD loading by default, using
Index: bin/gjdocxml2html.sh
===================================================================
RCS file: /cvsroot/cp-tools/gjdoc/bin/gjdocxml2html.sh,v
retrieving revision 1.7
diff -u -r1.7 gjdocxml2html.sh
--- bin/gjdocxml2html.sh	6 Oct 2002 23:26:59 -0000	1.7
+++ bin/gjdocxml2html.sh	26 Nov 2002 10:47:21 -0000
@@ -71,7 +71,7 @@
 # Start the xslt process
 
 xsltproc \
-    --novalid
+    --novalid \
     --param verbose "1" \
     --param now "'`date`'" \
     --param copyrightfile "'../classpath-copyright.xml'" \
Index: src/gnu/classpath/tools/doclets/xmldoclet/Driver.java
===================================================================
RCS file: /cvsroot/cp-tools/gjdoc/src/gnu/classpath/tools/doclets/xmldoclet/Driver.java,v
retrieving revision 1.9
diff -u -r1.9 Driver.java
--- src/gnu/classpath/tools/doclets/xmldoclet/Driver.java	12 May 2002 02:49:29 -0000	1.9
+++ src/gnu/classpath/tools/doclets/xmldoclet/Driver.java	26 Nov 2002 10:47:21 -0000
@@ -380,6 +380,8 @@
 	 access="protected";
       else if (programElementDoc.isPackagePrivate()) 
 	 access="package";
+      else if (programElementDoc.isPrivate()) 
+	 access="private";
       else
 	 throw new RuntimeException("Huh? "+programElementDoc+" is neither public, protected, protected nor package protected.");
       printAtomTag(level, "access scope=\""+access+"\"");
Index: src/gnu/classpath/tools/gjdoc/Debug.java
===================================================================
RCS file: /cvsroot/cp-tools/gjdoc/src/gnu/classpath/tools/gjdoc/Debug.java,v
retrieving revision 1.4
diff -u -r1.4 Debug.java
--- src/gnu/classpath/tools/gjdoc/Debug.java	20 Feb 2002 12:56:49 -0000	1.4
+++ src/gnu/classpath/tools/gjdoc/Debug.java	26 Nov 2002 10:47:21 -0000
@@ -22,7 +22,7 @@
 
 public final class Debug {
 
-   //private static final int logLevel = 7;
+   //private static int logLevel = 7;
    private static int logLevel = 0;
 
    static {
Index: src/gnu/classpath/tools/gjdoc/Main.java
===================================================================
RCS file: /cvsroot/cp-tools/gjdoc/src/gnu/classpath/tools/gjdoc/Main.java,v
retrieving revision 1.11
diff -u -r1.11 Main.java
--- src/gnu/classpath/tools/gjdoc/Main.java	9 May 2002 17:45:47 -0000	1.11
+++ src/gnu/classpath/tools/gjdoc/Main.java	26 Nov 2002 10:47:22 -0000
@@ -875,6 +875,9 @@
 	       for (StringTokenizer st=new StringTokenizer(args[0], File.pathSeparator); st.hasMoreTokens(); ) {
 		  String path = st.nextToken();
 		  File file = new File(path);
+		  if (!(file.exists())) {
+		     throw new RuntimeException("The source path " + path + " does not exist.");
+		  }
 		  option_sourcepath.add(file);
 	       }
 	    }
Index: src/gnu/classpath/tools/gjdoc/Parser.java
===================================================================
RCS file: /cvsroot/cp-tools/gjdoc/src/gnu/classpath/tools/gjdoc/Parser.java,v
retrieving revision 1.4
diff -u -r1.4 Parser.java
--- src/gnu/classpath/tools/gjdoc/Parser.java	9 May 2002 17:45:23 -0000	1.4
+++ src/gnu/classpath/tools/gjdoc/Parser.java	26 Nov 2002 10:47:22 -0000
@@ -438,10 +438,9 @@
 	     && source[index+2]=='a'
 	     && source[index+3]=='t'
 	     && source[index+4]=='i'
-	     && source[index+5]=='c'
-	     && Parser.WHITESPACE.indexOf(source[index+6])>=0) {
+	     && source[index+5]=='c') {
 
-	    for (index+=7; index<source.length && Parser.WHITESPACE.indexOf(source[index])>=0; ++index)
+	    for (index+=6; index<source.length && Parser.WHITESPACE.indexOf(source[index])>=0; ++index)
 	       ;
 
 	    if (index<source.length && source[index]=='{')