SUGGESTED FIX
*** /tmp/geta19656 Thu Dec 14 21:10:56 2000
--- src/share/classes/com/sun/tools/javadoc/Start.java Thu Dec 14 20:49:58 2000
***************
*** 371,376 ****
--- 371,386 ----
return new RootDocImpl(env, userClasses, userPkgs, options);
}
+ private static boolean legalClassName(String nm) {
+ if (!Character.isJavaIdentifierStart(nm.charAt(0)))
+ return false;
+ int n = nm.length();
+ for (int i = 1; i < n; i++)
+ if (!Character.isJavaIdentifierPart(nm.charAt(i)))
+ return false;
+ return true;
+ }
+
private void parseSourcePackage(Env env, String name) throws IOException {
Identifier id = Identifier.lookup(name);
// Check to see if the name refers to an entire
***************
*** 379,390 ****
boolean hasFiles = false;
if (pkg.exists()) {
Enumeration sourceEnum = pkg.getSourceFiles();
while (sourceEnum.hasMoreElements()) {
if (!hasFiles) {
docenv.notice("main.Loading_source_files_for_package", name);
hasFiles = true;
}
! env.parseFile((ClassFile)sourceEnum.nextElement());
}
}
if (!hasFiles) {
--- 389,407 ----
boolean hasFiles = false;
if (pkg.exists()) {
Enumeration sourceEnum = pkg.getSourceFiles();
+ nextFile:
while (sourceEnum.hasMoreElements()) {
if (!hasFiles) {
docenv.notice("main.Loading_source_files_for_package", name);
hasFiles = true;
}
! ClassFile cf = (ClassFile)sourceEnum.nextElement();
! String nm = cf.getName();
! if (nm.endsWith(".java"))
! nm = nm.substring(0, nm.length() - 5);
! if (!legalClassName(nm))
! continue;
! env.parseFile(cf);
}
}
if (!hasFiles) {
|
Java