From d2ba983e2cc2032446efea421b16e620e3a05651 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 11 Feb 2013 15:45:53 +0100
Subject: [PATCH] javadoc: use package notation for javadoc tool when
 everything from the package should be included, this won't work for custom
 scopes, file scopes, etc (IDEA-100666)

---
 .../com/intellij/javadoc/JavadocConfiguration.java  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java b/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
index 59449defd59a..5b7c3ef01ad2 100644
--- a/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
+++ b/java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
@@ -260,7 +260,12 @@ public class JavadocConfiguration implements ModuleRunProfile, JDOMExternalizabl
           final Collection<String> sources = new HashSet<String>();
           final Runnable findRunnable = new Runnable() {
             public void run() {
-              myGenerationOptions.accept(new MyContentIterator(myProject, packages, sources));
+              final int scopeType = myGenerationOptions.getScopeType();
+              final boolean usePackageNotation = scopeType == AnalysisScope.MODULE ||
+                                                 scopeType == AnalysisScope.MODULES ||
+                                                 scopeType == AnalysisScope.PROJECT ||
+                                                 scopeType == AnalysisScope.DIRECTORY;
+              myGenerationOptions.accept(new MyContentIterator(myProject, packages, sources, usePackageNotation));
             }
           };
           if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(findRunnable, "Search for sources to generate javadoc in...", false, myProject)) {
@@ -329,8 +334,10 @@ public class JavadocConfiguration implements ModuleRunProfile, JDOMExternalizabl
     private final PsiManager myPsiManager;
     private final Collection<String> myPackages;
     private final Collection<String> mySourceFiles;
+    private final boolean myUsePackageNotation;
 
-    public MyContentIterator(Project project, Collection<String> packages, Collection<String> sources) {
+    public MyContentIterator(Project project, Collection<String> packages, Collection<String> sources, boolean canUsePackageNotation) {
+      myUsePackageNotation = canUsePackageNotation;
       myPsiManager = PsiManager.getInstance(project);
       myPackages = packages;
       mySourceFiles = sources;
@@ -345,7 +352,7 @@ public class JavadocConfiguration implements ModuleRunProfile, JDOMExternalizabl
       if (file instanceof PsiJavaFile) {
         final PsiJavaFile javaFile = (PsiJavaFile)file;
         final String packageName = javaFile.getPackageName();
-        if (containsPackagePrefix(module, packageName) || (packageName.length() == 0 && !(javaFile instanceof JspFile))) {
+        if (containsPackagePrefix(module, packageName) || (packageName.length() == 0 && !(javaFile instanceof JspFile)) || !myUsePackageNotation) {
           mySourceFiles.add(FileUtil.toSystemIndependentName(fileOrDir.getPath()));
         }
         else {