From 4ee4cdfeca26d199df8d0696195c043a50a3ba89 Mon Sep 17 00:00:00 2001
From: "Anton.Makeev" <Anton.Makeev@jetbrains.com>
Date: Wed, 10 Feb 2010 17:53:55 +0300
Subject: [PATCH] Maven: correctly excluding output folders (IDEA-20803)

---
 .../org/jetbrains/idea/maven/importing/MavenFoldersImporter.java    | 6 ++----
 .../org/jetbrains/idea/maven/importing/FoldersImportingTest.java    | 5 ++++-
 ...enFoldersConfiguratorTest.java => MavenFoldersImporterTest.java} | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename plugins/maven/src/test/java/org/jetbrains/idea/maven/project/{MavenFoldersConfiguratorTest.java => MavenFoldersImporterTest.java} (99%)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java
index 6e78c91bcf..bdbe474cd4 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java
@@ -116,10 +116,8 @@ public class MavenFoldersImporter {
       myModel.useModuleOutput(myMavenProject.getOutputDirectory(),
                               myMavenProject.getTestOutputDirectory());
     }
-    else {
-      myModel.addExcludedFolder(myMavenProject.getOutputDirectory());
-      myModel.addExcludedFolder(myMavenProject.getTestOutputDirectory());
-    }
+    myModel.addExcludedFolder(myMavenProject.getOutputDirectory());
+    myModel.addExcludedFolder(myMavenProject.getTestOutputDirectory());
   }
 
   private void configExcludedFolders() {
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
index 4921cbd83d..e2e8c0fe4a 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
@@ -588,7 +588,10 @@ public class FoldersImportingTest extends MavenImportingTestCase {
 
     assertModules("project");
 
-    assertExcludes("project", "targetCustom");
+    assertExcludes("project",
+                   "targetCustom",
+                   "outputCustom",
+                   "testCustom");
     assertModuleOutput("project",
                        getProjectPath() + "/outputCustom",
                        getProjectPath() + "/testCustom");
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersConfiguratorTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java
similarity index 99%
rename from plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersConfiguratorTest.java
rename to plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java
index e649a0e8ec..d02596f9f1 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersConfiguratorTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java
@@ -28,7 +28,7 @@ import org.jetbrains.idea.maven.importing.MavenRootModelAdapter;
 
 import java.io.File;
 
-public class MavenFoldersConfiguratorTest extends MavenImportingTestCase {
+public class MavenFoldersImporterTest extends MavenImportingTestCase {
   public void testUpdatingExternallyCreatedFolders() throws Exception {
     importProject("<groupId>test</groupId>" +
                   "<artifactId>project</artifactId>" +
-- 
2.11.4.GIT