rpms/gjdoc/FC-4 gjdoc-importprocessingorder.patch, NONE, 1.1 gjdoc-resolvedimportnotfound.patch, NONE, 1.1

[fedora-cvs-commits at redhat.com]

Author: overholt

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

Added Files:
	gjdoc-importprocessingorder.patch 
	gjdoc-resolvedimportnotfound.patch 
Log Message:
Add patches

gjdoc-importprocessingorder.patch:
 Parser.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE gjdoc-importprocessingorder.patch ---
--- src/gnu/classpath/tools/gjdoc/Parser.java.orig	2005-07-03 18:07:09.000000000 -0400
+++ src/gnu/classpath/tools/gjdoc/Parser.java	2005-07-03 18:08:42.000000000 -0400
@@ -1,5 +1,5 @@
 /* gnu.classpath.tools.gjdoc.Parser
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001,2005 Free Software Foundation, Inc.
 
    This file is part of GNU Classpath.
 
@@ -208,7 +208,6 @@
       int process(Parser parser, char[] source, int startIndex, int endIndex) {
 	 String packageName=new String(source,startIndex+8,endIndex-startIndex-8-1).trim();
 	 parser.packageOpened(packageName);
-         parser.importedStatementList.add(packageName + ".*");
 	 return endIndex;
       }
    }
@@ -733,7 +732,6 @@
       importedStringList.clear();
       importedPackagesList.clear();
       importedStatementList.clear();
-      importedStatementList.add("java.lang.*");
       
       currentLine = 1;
 
@@ -841,6 +839,10 @@
          }
       }
 
+      if (currentPackageName != null)
+	importedStatementList.add(currentPackageName + ".*");
+      importedStatementList.add("java.lang.*");
+
       ClassDocImpl classDoc
 	 = ClassDocImpl.createInstance((ctx!=null)?(ctx.classDoc):null, currentPackage, 
 				       null,

gjdoc-resolvedimportnotfound.patch:
 RootDocImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE gjdoc-resolvedimportnotfound.patch ---
Index: src/gnu/classpath/tools/gjdoc/RootDocImpl.java
===================================================================
RCS file: /cvsroot/classpath/gjdoc/src/gnu/classpath/tools/gjdoc/RootDocImpl.java,v
retrieving revision 1.22
diff -u -r1.22 RootDocImpl.java
--- src/gnu/classpath/tools/gjdoc/RootDocImpl.java 18 May 2005 11:52:30 -0000 1.22
+++ src/gnu/classpath/tools/gjdoc/RootDocImpl.java 1 Jul 2005 18:45:52 -0000
@@ -664,10 +664,18 @@ 
       implements ResolvedImport
    {
       private String importSpecifier;
+      private String name;

       ResolvedImportNotFound(String importSpecifier)
       {
          this.importSpecifier = importSpecifier;
+         int ndx = importSpecifier.lastIndexOf('.');
+         if (ndx >= 0) {
+            this.name = importSpecifier.substring(ndx + 1);
+         }
+         else {
+            this.name = importSpecifier;
+         }
       }

       public String toString()
@@ -677,7 +685,10 @@ 

       public String match(String name)
       {
-         return null; // FIXME!
+	 if (name.equals(this.name))
+	    return this.name;
+	 // FIXME: note that we don't handle on-demand imports here.
+         return null;
       }

       public boolean mismatch(String name)