infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 10:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

7091528: javadoc attempts to parse .class files

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2011-09-16 16:18:46 -07:00
parent bd420dc94e
commit 51763c43f7
4 changed files with 137 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -257,24 +257,15 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
for (String p: excludedPackages)
includedPackages.put(p, false);
if (docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)) {
searchSubPackages(subPackages,
includedPackages,
packages, packageFiles,
StandardLocation.SOURCE_PATH,
EnumSet.of(JavaFileObject.Kind.SOURCE));
searchSubPackages(subPackages,
includedPackages,
packages, packageFiles,
StandardLocation.CLASS_PATH,
EnumSet.of(JavaFileObject.Kind.CLASS));
} else {
searchSubPackages(subPackages,
includedPackages,
packages, packageFiles,
StandardLocation.CLASS_PATH,
EnumSet.of(JavaFileObject.Kind.SOURCE, JavaFileObject.Kind.CLASS));
}
StandardLocation path = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)
? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH;
searchSubPackages(subPackages,
includedPackages,
packages, packageFiles,
path,
EnumSet.of(JavaFileObject.Kind.SOURCE));
return packageFiles;
}

71
langtools/test/tools/javadoc/parser/7091528/T7091528.java Normal file
View File

@ -0,0 +1,71 @@
/*
* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 7091528
* @summary javadoc attempts to parse .class files
* @compile p/C1.java p/q/C2.java
* @run main T7091528
*/
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
public class T7091528 {
public static void main(String... args) {
new T7091528().run();
}
void run() {
File testSrc = new File(System.getProperty("test.src"));
File testClasses = new File(System.getProperty("test.classes"));
String[] args = {
"-d", ".",
"-sourcepath", testClasses + File.pathSeparator + testSrc,
"-subpackages",
"p"
};
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
String doclet = com.sun.tools.doclets.standard.Standard.class.getName();
int rc = com.sun.tools.javadoc.Main.execute("javadoc", pw, pw, pw, doclet, args);
pw.close();
String out = sw.toString();
if (!out.isEmpty()) {
System.err.println(out);
}
if (rc != 0)
System.err.println("javadoc failed: exit code = " + rc);
if (out.matches("(?s).*p/[^ ]+\\.class.*"))
throw new Error("reading .class files");
if (!new File("index.html").exists())
throw new Error("index.html not found");
}
}

28
langtools/test/tools/javadoc/parser/7091528/p/C1.java Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package p1;
/** This is class C1. */
public class C1 { }

28
langtools/test/tools/javadoc/parser/7091528/p/q/C2.java Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package p.q;
/** This is class p.q.C2. */
public class C2 { }