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

Revert "send FileGenerated event about just copied form runtime classes (affects IDEA-94779 Automatically copy form runtime classe to output directory)"

Browse Source 
This reverts commit fcc10bf987.
This commit is contained in:
Kirill Likhodedov
2012-11-15 21:33:38 +01:00
parent 0eb0a81f9a
commit 7044e18363
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+1 -14
View File
@@ -43,7 +43,6 @@ import org.jetbrains.jps.incremental.*;
import org.jetbrains.jps.incremental.Utils;
import org.jetbrains.jps.incremental.messages.BuildMessage;
import org.jetbrains.jps.incremental.messages.CompilerMessage;
import org.jetbrains.jps.incremental.messages.FileGeneratedEvent;
import org.jetbrains.jps.incremental.messages.ProgressMessage;
import org.jetbrains.jps.incremental.storage.BuildDataManager;
import org.jetbrains.jps.incremental.storage.OneToManyPathsMapping;
@@ -367,19 +366,7 @@ public class JavaBuilder extends ModuleLevelBuilder {
if (!target.isTests()) {
final File outputDir = target.getOutputDir();
if (outputDir != null) {
final String outputRoot = FileUtil.toSystemIndependentName(outputDir.getPath());
final List<File> generatedFiles = CopyResourcesUtil.copyFormsRuntime(outputRoot, false);
if (!generatedFiles.isEmpty()) {
// now inform others about files just copied
final FileGeneratedEvent event = new FileGeneratedEvent();
for (File file : generatedFiles) {
final String relativePath = FileUtil.getRelativePath(outputRoot, FileUtil.toSystemIndependentName(file.getPath()), '/');
if (relativePath != null) {
event.add(outputRoot, relativePath);
}
}
context.processMessage(event);
}
CopyResourcesUtil.copyFormsRuntime(outputDir.getAbsolutePath(), false);
}
}
}
plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/UiDesignerExternalBuildTest.java
+2 -3
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.packaging.artifacts.Artifact;
import com.intellij.uiDesigner.core.AbstractLayout;
import java.io.File;
import java.io.IOException;
@@ -52,8 +51,8 @@ public class UiDesignerExternalBuildTest extends ArtifactCompilerTestCase {
File outputDir = VfsUtilCore.virtualToIoFile(getOutputDir(a));
assertTrue(new File(outputDir, "A.class").exists());
assertTrue(new File(outputDir, "B.class").exists());
assertTrue(new File(outputDir, AbstractLayout.class.getName().replace('.', '/') + ".class").exists());
//todo[jeka] fix
//assertTrue(new File(outputDir, AbstractLayout.class.getName().replace('.', '/') + ".class").exists());
}
}