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

Exclude target/work/* expect target/work/plugins

Browse Source
This commit is contained in:
Sergey Evdokimov
2013-08-30 14:06:10 +04:00
parent bdf2e586ab
commit 7bbb306308
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
+4 -6
View File
@@ -25,9 +25,9 @@ import com.intellij.openapi.module.ModifiableModuleModel;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.StdModuleTypes;
import com.intellij.openapi.roots.impl.ModifiableModelCommitter;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.roots.impl.ModifiableModelCommitter;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.roots.libraries.LibraryTable;
import com.intellij.openapi.roots.libraries.LibraryUtil;
@@ -103,13 +103,11 @@ public class MvcModuleStructureUtil {
removeSrcFolderFromRoots(root.findFileByRelativePath(src), actions, sourceRoots);
}
for (final String excluded : structure.getExcludedFolders()) {
final VirtualFile src = root.findFileByRelativePath(excluded);
if (src != null && moduleRootManager.getFileIndex().isInContent(src)) {
for (final VirtualFile excluded : structure.getExcludedFolders(root)) {
if (moduleRootManager.getFileIndex().isInContent(excluded)) {
actions.add(new Consumer<ContentEntry>() {
public void consume(ContentEntry contentEntry) {
contentEntry.addExcludeFolder(src);
contentEntry.addExcludeFolder(excluded);
}
});
}
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcProjectStructure.java
+16
View File
@@ -21,7 +21,9 @@ import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/**
* @author peter
@@ -58,8 +60,22 @@ public abstract class MvcProjectStructure {
public abstract String[] getSourceFolders();
public abstract String[] getTestFolders();
public abstract String[] getInvalidSourceFolders();
public abstract String[] getExcludedFolders();
public List<VirtualFile> getExcludedFolders(@NotNull VirtualFile root) {
List<VirtualFile> res = new ArrayList<VirtualFile>();
for (final String excluded : getExcludedFolders()) {
VirtualFile dir = root.findFileByRelativePath(excluded);
if (dir != null) {
res.add(dir);
}
}
return res;
}
public void setupFacets(Collection<Runnable> actions, Collection<VirtualFile> roots) {
}