Changeset 390 for trunk/openjdk/langtools

Timestamp:

Jul 2, 2012, 3:05:26 PM (13 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b25 from branches/vendor/oracle.

This accompanies an incomplete r389.

Location:

trunk/openjdk/langtools

Files:

• src/share/classes/com/sun/tools/javadoc/JavadocTool.java (modified) (2 diffs)
• test/tools/javadoc/parser (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser )
• test/tools/javadoc/parser/7091528 (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528 )
• test/tools/javadoc/parser/7091528/T7091528.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528/T7091528.java )
• test/tools/javadoc/parser/7091528/p (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528/p )
• test/tools/javadoc/parser/7091528/p/C1.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528/p/C1.java )
• test/tools/javadoc/parser/7091528/p/q (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528/p/q )
• test/tools/javadoc/parser/7091528/p/q/C2.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/langtools/test/tools/javadoc/parser/7091528/p/q/C2.java )

trunk/openjdk/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java

@@ -1 +1 @@
 /*
- * Copyright (c) 2001, 2006, 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.
  *
@@ -261 +261 @@
             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;
     }