MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-103878 Option "Don't Detect" for Settings -> Maven -> Importing -> Generated sources folder has not the desired effect +review CR-IC @Anton.Makeev

Browse Source
This commit is contained in:
Sergey Evdokimov
2013-04-24 20:01:29 +04:00
parent e242282deb
commit f4f6df79f2
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenFoldersImporter.java
+4 -2
View File
@@ -186,8 +186,10 @@ public class MavenFoldersImporter {
myModel.unregisterAll(targetDir.getPath(), true, false);
myModel.addSourceFolder(myMavenProject.getAnnotationProcessorDirectory(true), true, true);
myModel.addSourceFolder(myMavenProject.getAnnotationProcessorDirectory(false), false, true);
if (myImportingSettings.getGeneratedSourcesFolder() != MavenImportingSettings.GeneratedSourcesFolder.IGNORE) {
myModel.addSourceFolder(myMavenProject.getAnnotationProcessorDirectory(true), true, true);
myModel.addSourceFolder(myMavenProject.getAnnotationProcessorDirectory(false), false, true);
}
File[] targetChildren = targetDir.listFiles();
plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
+19
View File
@@ -608,6 +608,25 @@ public class FoldersImportingTest extends MavenImportingTestCase {
"target/generated-sources");
}
public void testIgnoreGeneratedSources() throws Exception {
createStdProjectFolders();
MavenProjectsManager.getInstance(myProject).getImportingSettings().setGeneratedSourcesFolder(
MavenImportingSettings.GeneratedSourcesFolder.IGNORE);
createProjectSubFile("target/generated-sources/annotations/A.java", "package com; class A {}");
createProjectSubFile("target/generated-sources/annotations/com/B.java", "package com; class B {}");
importProject("<groupId>test</groupId>" +
"<artifactId>project</artifactId>" +
"<version>1</version>");
assertSources("project",
"src/main/java",
"src/main/resources");
}
public void testAddingExistingGeneratedSources4() throws Exception {
createStdProjectFolders();