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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
irengrig
2012-01-16 13:11:52 +04:00
parent 6ec652a36e ee47a549ea
commit 052143b4e4
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompilerUtil.java
+26 -6
View File
@@ -15,9 +15,14 @@
*/
package com.intellij.packaging.impl.compiler;
import com.intellij.facet.Facet;
import com.intellij.facet.FacetManager;
import com.intellij.facet.FacetRootsProvider;
import com.intellij.openapi.compiler.CompileContext;
import com.intellij.openapi.compiler.CompilerMessageCategory;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.JarFileSystem;
@@ -92,7 +97,7 @@ public class ArtifactCompilerUtil {
ContainerUtil.addIfNotNull(artifact.getOutputFile(), allOutputs);
}
final Set<VirtualFile> affectedOutputPaths = new HashSet<VirtualFile>();
final Set<VirtualFile> roots = new HashSet<VirtualFile>();
final PackagingElementResolvingContext context = ArtifactManager.getInstance(project).getResolvingContext();
for (Artifact artifact : ArtifactManager.getInstance(project).getArtifacts()) {
ArtifactUtil.processPackagingElements(artifact, null, new PackagingElementProcessor<PackagingElement<?>>() {
@@ -106,17 +111,32 @@ public class ArtifactCompilerUtil {
if (element instanceof FileOrDirectoryCopyPackagingElement<?>) {
final VirtualFile file = ((FileOrDirectoryCopyPackagingElement)element).findFile();
if (file != null) {
for (VirtualFile output : allOutputs) {
if (VfsUtilCore.isAncestor(output, file, false)) {
affectedOutputPaths.add(output);
}
}
roots.add(file);
}
}
return true;
}
}, context, true);
}
final Module[] modules = ModuleManager.getInstance(project).getModules();
for (Module module : modules) {
final Facet[] facets = FacetManager.getInstance(module).getAllFacets();
for (Facet facet : facets) {
if (facet instanceof FacetRootsProvider) {
roots.addAll(((FacetRootsProvider)facet).getFacetRoots());
}
}
}
final Set<VirtualFile> affectedOutputPaths = new HashSet<VirtualFile>();
for (VirtualFile output : allOutputs) {
for (VirtualFile root : roots) {
if (VfsUtilCore.isAncestor(output, root, false)) {
affectedOutputPaths.add(output);
}
}
}
return affectedOutputPaths;
}
}