From 7044e183631c326549a37bd7b0dc60c5136dc177 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 15 Nov 2012 21:33:38 +0100 Subject: [PATCH] Revert "send FileGenerated event about just copied form runtime classes (affects IDEA-94779 Automatically copy form runtime classe to output directory)" This reverts commit fcc10bf987593f04441502c31459d72aaafb683e. --- .../jps/incremental/java/JavaBuilder.java | 15 +-------------- .../make/UiDesignerExternalBuildTest.java | 5 ++--- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java index 5dda3e015b26..a566451157e9 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java @@ -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 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); } } } diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/UiDesignerExternalBuildTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/UiDesignerExternalBuildTest.java index 091ed0b39649..da4b4233d5ff 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/UiDesignerExternalBuildTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/UiDesignerExternalBuildTest.java @@ -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()); } }