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

Kaffe CVS cvs-commits at kaffe.org
Wed Oct 20 12:32:18 PDT 2004


PatchSet 5317 
Date: 2004/10/20 19:28:13
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with gjdoc: various fixes

2004-10-20  Dalibor Topic  <robilad at kaffe.org>

        * tools/gjdoc/javalib/doctranslets/html/allclasses.xsl,
        tools/gjdoc/javalib/doctranslets/html/allpackages.xsl,
        tools/gjdoc/javalib/doctranslets/html/classdoc.xsl,
        tools/gjdoc/javalib/doctranslets/html/descriptor.xsl,
        tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl,
        tools/gjdoc/javalib/doctranslets/html/fulltree.xsl,
        tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl,
        tools/gjdoc/javalib/doctranslets/html/index.xsl,
        tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl,
        tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl,
        tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl,
        tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocProxy.java,
        tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java:
        Resynced with gjdoc.

        2004-10-11  Arnaud Vandyck <avdyk at gnu.org>

        * src/gnu/classpath/tools/gjdoc/ClassDocProxy: removed unnecessary
        assignation (see patch#1964 at Savannah's cp-tools project).
        * 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).

Members: 
	ChangeLog:1.2869->1.2870 
	tools/gjdoc/javalib/doctranslets/html/allclasses.xsl:1.1->1.2 
	tools/gjdoc/javalib/doctranslets/html/allpackages.xsl:1.1->1.2 
	tools/gjdoc/javalib/doctranslets/html/classdoc.xsl:1.1->1.2 
	tools/gjdoc/javalib/doctranslets/html/descriptor.xsl:1.1->1.2 
	tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl:1.1->1.2 
	tools/gjdoc/javalib/doctranslets/html/fulltree.xsl:1.1->1.2 
	tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl:1.1->1.2 
	tools/gjdoc/javalib/doctranslets/html/index.xsl:1.1->1.2 
	tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl:1.1->1.2 
	tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl:1.1->1.2 
	tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl:1.1->1.2 
	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocProxy.java:1.1->1.2 
	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2869 kaffe/ChangeLog:1.2870
--- kaffe/ChangeLog:1.2869	Wed Oct 20 18:04:43 2004
+++ kaffe/ChangeLog	Wed Oct 20 19:28:13 2004
@@ -1,5 +1,34 @@
 2004-10-20  Dalibor Topic  <robilad at kaffe.org>
 
+	* tools/gjdoc/javalib/doctranslets/html/allclasses.xsl,
+	tools/gjdoc/javalib/doctranslets/html/allpackages.xsl,
+	tools/gjdoc/javalib/doctranslets/html/classdoc.xsl,
+	tools/gjdoc/javalib/doctranslets/html/descriptor.xsl,
+	tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl,
+	tools/gjdoc/javalib/doctranslets/html/fulltree.xsl,
+	tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl,
+	tools/gjdoc/javalib/doctranslets/html/index.xsl,
+	tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl,
+	tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl,
+	tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl,
+	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocProxy.java,
+	tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java:
+	Resynced with gjdoc.
+
+	2004-10-11  Arnaud Vandyck <avdyk at gnu.org>
+
+        * src/gnu/classpath/tools/gjdoc/ClassDocProxy: removed unnecessary
+        assignation (see patch#1964 at Savannah's cp-tools project).
+        * 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).
+
+2004-10-20  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/xml/xpath/XPathParser.y:
 	New file taken from GNU JAXP.
 
Index: kaffe/tools/gjdoc/javalib/doctranslets/html/allclasses.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/allclasses.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/allclasses.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/allclasses.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/allclasses.xsl	Wed Oct 20 19:28:15 2004
@@ -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: kaffe/tools/gjdoc/javalib/doctranslets/html/allpackages.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/allpackages.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/allpackages.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/allpackages.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/allpackages.xsl	Wed Oct 20 19:28:16 2004
@@ -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: kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/classdoc.xsl	Wed Oct 20 19:28:16 2004
@@ -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: kaffe/tools/gjdoc/javalib/doctranslets/html/descriptor.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/descriptor.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/descriptor.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/descriptor.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/descriptor.xsl	Wed Oct 20 19:28:16 2004
@@ -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: kaffe/tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/doctranslet.xsl	Wed Oct 20 19:28:16 2004
@@ -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: kaffe/tools/gjdoc/javalib/doctranslets/html/fulltree.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/fulltree.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/fulltree.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/fulltree.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/fulltree.xsl	Wed Oct 20 19:28:16 2004
@@ -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: kaffe/tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/gjdoc.xsl	Wed Oct 20 19:28:16 2004
@@ -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: kaffe/tools/gjdoc/javalib/doctranslets/html/index.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/index.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/index.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/index.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/index.xsl	Wed Oct 20 19:28:16 2004
@@ -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: kaffe/tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/index_noframes.xsl	Wed Oct 20 19:28:16 2004
@@ -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: kaffe/tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/packageclasses.xsl	Wed Oct 20 19:28:16 2004
@@ -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: kaffe/tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl
diff -u kaffe/tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl:1.1 kaffe/tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl:1.2
--- kaffe/tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl:1.1	Wed Apr 14 19:41:08 2004
+++ kaffe/tools/gjdoc/javalib/doctranslets/html/packagedoc.xsl	Wed Oct 20 19:28:16 2004
@@ -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="*"/>
Index: kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocProxy.java
diff -u kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocProxy.java:1.1 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocProxy.java:1.2
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocProxy.java:1.1	Wed Apr 14 19:41:12 2004
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/ClassDocProxy.java	Wed Oct 20 19:28:16 2004
@@ -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: kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java
diff -u kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java:1.1 kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java:1.2
--- kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java:1.1	Wed Apr 14 19:41:12 2004
+++ kaffe/tools/gjdoc/javalib/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java	Wed Oct 20 19:28:16 2004
@@ -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) {



More information about the kaffe mailing list