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

Maven: 'keep source and test folders' import option

Browse Source
This commit is contained in:
Anton Makeev
2011-03-16 18:27:10 +01:00
parent 3c5f22cde0
commit 2cb6ae6549
3 changed files with 15 additions and 9 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
+10 -8
View File
@@ -101,22 +101,24 @@ public class MavenFoldersImporter {
testFolders.add(each.getDirectory());
}
// then sources
sourceFolders.addAll(myMavenProject.getSources());
testFolders.addAll(myMavenProject.getTestSources());
// and additional sources
// then plugin-provided sources (can override resources )
for (MavenImporter each : MavenImporter.getSuitableImporters(myMavenProject)) {
each.collectSourceFolders(myMavenProject, sourceFolders);
each.collectTestFolders(myMavenProject, testFolders);
}
for (String each : sourceFolders) {
myModel.addSourceFolder(each, false);
}
// and sources (can override resources and plugin-defined sources)
sourceFolders.addAll(myMavenProject.getSources());
testFolders.addAll(myMavenProject.getTestSources());
// first add test folders
for (String each : testFolders) {
myModel.addSourceFolder(each, true);
}
// when source folders (can override test folders)
for (String each : sourceFolders) {
myModel.addSourceFolder(each, false);
}
}
private void configOutputFolders() {
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
+1 -1
View File
@@ -162,7 +162,7 @@
</grid>
<component id="6d280" class="javax.swing.JCheckBox" binding="myKeepSourceFoldersCheckBox">
<constraints>
<grid row="6" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
<grid row="6" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Keep source and test &amp;folders on reimport"/>
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
+4
View File
@@ -169,6 +169,10 @@ public class MavenProjectsManager extends SimpleProjectComponent
synchronized (isInitialized) {
if (isInitialized.getAndSet(true)) return;
if (isNew) {
getImportingSettings().setKeepSourceFolders(false);
}
initProjectsTree(!isNew);
initWorkers();