rpms/gjdoc/devel gjdoc-checkparamslength.patch, NONE, 1.1 gjdoc-parameterimpl.patch, NONE, 1.1 gjdoc.spec, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: overholt

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6672

Modified Files:
	gjdoc.spec 
Added Files:
	gjdoc-checkparamslength.patch gjdoc-parameterimpl.patch 
Log Message:
* Mon Apr 25 2005 Andrew Overholt <overholt at redhat.com> 0.7.4-2
- Add patches from head (Julian Scheid).


gjdoc-checkparamslength.patch:
 HtmlDoclet.java |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gjdoc-checkparamslength.patch ---
===================================================================
RCS file: /cvsroot/classpath/cvsroot/classpath/gjdoc/src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- classpath/gjdoc/src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java	2005/04/20 18:22:06	1.47
+++ classpath/gjdoc/src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java	2005/04/25 12:46:39	1.48
@@ -3636,7 +3636,7 @@
   {
     String parameters = "";
     TypeVariable[] params = classDoc.typeParameters();
-    if (params != null)
+    if (params != null && params.length > 0)
       {
 	parameters = "<";
 	for (int a = 0; a < params.length; ++a)

gjdoc-parameterimpl.patch:
 ParameterImpl.java |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE gjdoc-parameterimpl.patch ---
diff -uNr gjdoc-0.7.4.orig/src/gnu/classpath/tools/gjdoc/ParameterImpl.java gjdoc-0.7.4.parameterimpl/src/gnu/classpath/tools/gjdoc/ParameterImpl.java
--- gjdoc-0.7.4.orig/src/gnu/classpath/tools/gjdoc/ParameterImpl.java	2005-04-25 10:47:16.000000000 -0400
+++ gjdoc-0.7.4.parameterimpl/src/gnu/classpath/tools/gjdoc/ParameterImpl.java	2005-04-25 10:49:28.000000000 -0400
@@ -39,10 +39,8 @@
       if (type instanceof ClassDocProxy) {
 	 String className=type.qualifiedTypeName();
 	 ClassDoc realClassDoc=classContext.findClass(className);
-	 if (realClassDoc!=null)
+	 if (realClassDoc!=null) {
 	    type=realClassDoc;
-	 else {
-	    type=new TypeImpl(null, className, type.dimension());
 	 }
       }
    }


Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gjdoc.spec	24 Apr 2005 21:11:06 -0000	1.16
+++ gjdoc.spec	25 Apr 2005 14:59:25 -0000	1.17
@@ -2,13 +2,15 @@
 
 Name: gjdoc
 Version: 0.7.4
-Release: 1
+Release: 2
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
 Group: Development/Tools
 
 Source0: ftp://ftp.gnu.org/gnu/classpath/gjdoc-%{version}.tar.gz
+Patch0: gjdoc-checkparamslength.patch
+Patch1: gjdoc-parameterimpl.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: gcc-java >= 4.0.0-1
@@ -21,6 +23,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p2
+%patch1 -p1
 
 %build
 %configure
@@ -42,6 +46,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 25 2005 Andrew Overholt <overholt at redhat.com> 0.7.4-2
+- Add patches from head (Julian Scheid).
+
 * Sun Apr 24 2005 Andrew Overholt <overholt at redhat.com> 0.7.4-1
 - New version.