diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-07-08 11:26:24 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-07-08 11:26:24 -0700 |
| commit | c1ace1f7e1e49c81bb4b75377c99f07be340abfe (patch) | |
| tree | 9d0db96bd3d86ddfec80e7e3554cad9dcc066553 /plugins/ant/jps-plugin | |
| parent | c6218e46d5d2017e987ecdbd99b318a95c42abc0 (diff) | |
| download | idea-c1ace1f7e1e49c81bb4b75377c99f07be340abfe.tar.gz | |
Snapshot aea001abfc1b38fec3a821bcd5174cc77dc75787 from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: Icdea2a2bd7ad43b4d05967b1f0479db3bda1c93c
Diffstat (limited to 'plugins/ant/jps-plugin')
| -rw-r--r-- | plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/build/AntArtifactBuildTaskProvider.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/build/AntArtifactBuildTaskProvider.java b/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/build/AntArtifactBuildTaskProvider.java index f86377fb4153..6a4c9c8fdf2e 100644 --- a/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/build/AntArtifactBuildTaskProvider.java +++ b/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/build/AntArtifactBuildTaskProvider.java @@ -29,6 +29,7 @@ import com.intellij.rt.ant.execution.AntMain2; import com.intellij.util.SystemProperties; import com.intellij.util.execution.ParametersListUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.ant.model.JpsAntBuildFileOptions; import org.jetbrains.jps.ant.model.JpsAntExtensionService; import org.jetbrains.jps.ant.model.JpsAntInstallation; @@ -73,9 +74,16 @@ public class AntArtifactBuildTaskProvider extends ArtifactBuildTaskProvider { return Collections.emptyList(); } + @Nullable private static JpsAntArtifactExtension getBuildExtension(JpsArtifact artifact, ArtifactBuildPhase buildPhase) { - return buildPhase == ArtifactBuildPhase.PRE_PROCESSING ? JpsAntExtensionService.getPreprocessingExtension(artifact) - : JpsAntExtensionService.getPostprocessingExtension(artifact); + switch (buildPhase) { + case PRE_PROCESSING: + return JpsAntExtensionService.getPreprocessingExtension(artifact); + case POST_PROCESSING: + return JpsAntExtensionService.getPostprocessingExtension(artifact); + default: + return null; + } } private static class AntArtifactBuildTask extends BuildTask { |