From 8982cb360f46841fc313074577724c87c8136d33 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 30 Oct 2009 14:38:23 +0300 Subject: [PATCH] obsolete code removed --- .../ant/j2ee/CompositeBuildTarget.java | 1 - .../DefaultExplodedAndJarBuildGenerator.java | 55 ------------------- .../make/ExplodedAndJarBuildGenerator.java | 11 ---- .../compiler/make/BuildParticipantBase.java | 36 ++++++------ 4 files changed, 20 insertions(+), 83 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/CompositeBuildTarget.java b/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/CompositeBuildTarget.java index d793eebe1014..46fdb2a75163 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/CompositeBuildTarget.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/CompositeBuildTarget.java @@ -41,7 +41,6 @@ public class CompositeBuildTarget extends CompositeGenerator { final String depends, @Nullable String jarPath) { final File moduleBaseDir = parameters.getChunk().getBaseDir(); - final Module containingModule = parameters.getContainingModule(); final Target buildTarget = new Target(targetName, depends, targetDescription, null); final BuildConfiguration buildConfiguration = parameters.getBuildConfiguration(); diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/DefaultExplodedAndJarBuildGenerator.java b/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/DefaultExplodedAndJarBuildGenerator.java index ac490077f162..e27520f60659 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/DefaultExplodedAndJarBuildGenerator.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/j2ee/DefaultExplodedAndJarBuildGenerator.java @@ -21,7 +21,6 @@ import com.intellij.compiler.make.ExplodedAndJarBuildGenerator; import com.intellij.compiler.make.MakeUtil; import com.intellij.openapi.compiler.make.*; import com.intellij.openapi.module.Module; -import com.intellij.openapi.util.Ref; import com.intellij.util.SmartList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -105,58 +104,4 @@ public class DefaultExplodedAndJarBuildGenerator extends ExplodedAndJarBuildGene } - - @NotNull - public ZipFileSet[] generateTagsForJarTarget(@NotNull final BuildInstruction instruction, @NotNull final ExplodedAndJarTargetParameters parameters, - final Ref tempDirUsed) - throws Exception { - final List zipFileSetTags = new SmartList(); - final String tempDirProperty = BuildProperties.getTempDirForModuleProperty(parameters.getContainingModule().getName()); - final File moduleBaseDir = parameters.getChunk().getBaseDir(); - instruction.accept(new BuildInstructionVisitor() { - public boolean visitFileCopyInstruction(FileCopyInstruction instruction) throws RuntimeException { - if (instruction.isExternalDependencyInstruction()) return true; - final File sourceFile = instruction.getFile(); - final Module instructionModule = instruction.getModule(); - final String sourceLocation = GenerationUtils.toRelativePath(sourceFile.getPath(), moduleBaseDir, instructionModule, - parameters.getGenerationOptions()); - final ZipFileSet fileSet = new ZipFileSet(sourceLocation, instruction.getOutputRelativePath(), instruction.isDirectory()); - - zipFileSetTags.add(fileSet); - return true; - } - - public boolean visitJarAndCopyBuildInstruction(JarAndCopyBuildInstruction instruction) throws RuntimeException { - if (instruction.isExternalDependencyInstruction()) return true; - tempDirUsed.set(true); - final String jarName = new File(instruction.getOutputRelativePath()).getName(); - final String destJarPath = BuildProperties.propertyRef(tempDirProperty)+"/"+jarName; - - zipFileSetTags.add(new ZipFileSet(destJarPath, instruction.getOutputRelativePath(), false)); - return true; - } - - }); - return zipFileSetTags.toArray(new ZipFileSet[zipFileSetTags.size()]); - } - - @NotNull - public Tag[] generateJarBuildPrepareTags(@NotNull final BuildInstruction instruction, @NotNull final ExplodedAndJarTargetParameters parameters) - throws Exception { - final List prepareTags = new SmartList(); - final String tempDirProperty = BuildProperties.getTempDirForModuleProperty(parameters.getContainingModule().getName()); - final File moduleBaseDir = parameters.getChunk().getBaseDir(); - instruction.accept(new BuildInstructionVisitor() { - - public boolean visitJarAndCopyBuildInstruction(JarAndCopyBuildInstruction instruction) throws RuntimeException { - if (instruction.isExternalDependencyInstruction()) return true; - final String jarName = new File(instruction.getOutputRelativePath()).getName(); - final String destJarPath = BuildProperties.propertyRef(tempDirProperty)+"/"+jarName; - prepareTags.add(generateJarTag(instruction, destJarPath, moduleBaseDir, parameters.getGenerationOptions())); - return true; - } - - }); - return prepareTags.toArray(new Tag[prepareTags.size()]); - } } diff --git a/java/compiler/impl/src/com/intellij/compiler/make/ExplodedAndJarBuildGenerator.java b/java/compiler/impl/src/com/intellij/compiler/make/ExplodedAndJarBuildGenerator.java index 0fe4aa104d7a..a4e462a14c3d 100644 --- a/java/compiler/impl/src/com/intellij/compiler/make/ExplodedAndJarBuildGenerator.java +++ b/java/compiler/impl/src/com/intellij/compiler/make/ExplodedAndJarBuildGenerator.java @@ -37,15 +37,4 @@ public abstract class ExplodedAndJarBuildGenerator { return null; } - @Nullable - public ZipFileSet[] generateTagsForJarTarget(@NotNull BuildInstruction instruction, @NotNull ExplodedAndJarTargetParameters parameters, - final Ref tempDirUsed) throws Exception { - return null; - } - - @Nullable - public Tag[] generateJarBuildPrepareTags(@NotNull BuildInstruction instruction, @NotNull ExplodedAndJarTargetParameters parameters) throws Exception { - return null; - } - } diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildParticipantBase.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildParticipantBase.java index 7511a6698a82..909800187653 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildParticipantBase.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/make/BuildParticipantBase.java @@ -56,22 +56,7 @@ public abstract class BuildParticipantBase extends BuildParticipant { final ConfigFile[] deploymentDescriptors = getDeploymentDescriptors(); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { - for (ConfigFile descriptor : deploymentDescriptors) { - VirtualFile virtualFile = descriptor.getVirtualFile(); - if (virtualFile != null) { - ConfigFileMetaData metaData = descriptor.getMetaData(); - final File file = VfsUtil.virtualToIoFile(virtualFile); - final String fileName; - if (metaData.isFileNameFixed()) { - fileName = metaData.getFileName(); - } - else { - fileName = virtualFile.getName(); - } - instructions.addFileCopyInstruction(file, false, myModule, metaData.getDirectoryPath() + "/" + fileName, null); - } - - } + registerDescriptorCopyingInstructions(BuildParticipantBase.this.myModule, deploymentDescriptors, instructions); final CustomConfigFile[] customDescriptors = getCustomDescriptors(); @@ -87,6 +72,25 @@ public abstract class BuildParticipantBase extends BuildParticipant { }); } + public static void registerDescriptorCopyingInstructions(Module module, ConfigFile[] deploymentDescriptors, BuildRecipe instructions) { + for (ConfigFile descriptor : deploymentDescriptors) { + VirtualFile virtualFile = descriptor.getVirtualFile(); + if (virtualFile != null) { + ConfigFileMetaData metaData = descriptor.getMetaData(); + final File file = VfsUtil.virtualToIoFile(virtualFile); + final String fileName; + if (metaData.isFileNameFixed()) { + fileName = metaData.getFileName(); + } + else { + fileName = virtualFile.getName(); + } + instructions.addFileCopyInstruction(file, false, module, metaData.getDirectoryPath() + "/" + fileName, null); + } + + } + } + protected CustomConfigFile[] getCustomDescriptors() { return CustomConfigFile.EMPTY_ARRAY; }