From c37159ed4396849bd3a861d827b5dafba9982a7d Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 28 Dec 2009 14:07:37 +0300 Subject: [PATCH] suggest output path for artifact even if project output dir isn't specified --- .../src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java index 9ff9789982..87170aa102 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java @@ -198,8 +198,12 @@ public class ArtifactUtil { public static String getDefaultArtifactOutputPath(@NotNull String artifactName, final @NotNull Project project) { final CompilerProjectExtension extension = CompilerProjectExtension.getInstance(project); if (extension == null) return null; - final String outputUrl = extension.getCompilerOutputUrl(); - if (outputUrl == null) return null; + String outputUrl = extension.getCompilerOutputUrl(); + if (outputUrl == null || outputUrl.length() == 0) { + final VirtualFile baseDir = project.getBaseDir(); + if (baseDir == null) return null; + outputUrl = baseDir.getUrl() + "/out"; + } return VfsUtil.urlToPath(outputUrl) + "/artifacts/" + FileUtil.sanitizeFileName(artifactName); } -- 2.11.4.GIT