1.1 --- a/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Fri Sep 16 14:16:11 2011 +0100
1.2 +++ b/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Fri Sep 16 16:18:46 2011 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -257,24 +257,15 @@
1.11 for (String p: excludedPackages)
1.12 includedPackages.put(p, false);
1.13
1.14 - if (docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)) {
1.15 - searchSubPackages(subPackages,
1.16 - includedPackages,
1.17 - packages, packageFiles,
1.18 - StandardLocation.SOURCE_PATH,
1.19 - EnumSet.of(JavaFileObject.Kind.SOURCE));
1.20 - searchSubPackages(subPackages,
1.21 - includedPackages,
1.22 - packages, packageFiles,
1.23 - StandardLocation.CLASS_PATH,
1.24 - EnumSet.of(JavaFileObject.Kind.CLASS));
1.25 - } else {
1.26 - searchSubPackages(subPackages,
1.27 - includedPackages,
1.28 - packages, packageFiles,
1.29 - StandardLocation.CLASS_PATH,
1.30 - EnumSet.of(JavaFileObject.Kind.SOURCE, JavaFileObject.Kind.CLASS));
1.31 - }
1.32 + StandardLocation path = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)
1.33 + ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH;
1.34 +
1.35 + searchSubPackages(subPackages,
1.36 + includedPackages,
1.37 + packages, packageFiles,
1.38 + path,
1.39 + EnumSet.of(JavaFileObject.Kind.SOURCE));
1.40 +
1.41 return packageFiles;
1.42 }
1.43
