From c2256d62033210970541f6a9072b46dc542f5d06 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 12 Nov 2009 11:21:59 +0300 Subject: [PATCH] suggest an appropriate name for archive artifacts created from exploded --- .../com/intellij/packaging/artifacts/ArtifactTemplate.java | 6 ++++++ .../artifacts/ArtifactsStructureConfigurable.java | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/java/compiler/openapi/src/com/intellij/packaging/artifacts/ArtifactTemplate.java b/java/compiler/openapi/src/com/intellij/packaging/artifacts/ArtifactTemplate.java index 1b35071bb41d..342ceb5b7462 100644 --- a/java/compiler/openapi/src/com/intellij/packaging/artifacts/ArtifactTemplate.java +++ b/java/compiler/openapi/src/com/intellij/packaging/artifacts/ArtifactTemplate.java @@ -22,7 +22,13 @@ import org.jetbrains.annotations.NotNull; * @author nik */ public abstract class ArtifactTemplate { + public abstract String getPresentableName(); public abstract CompositePackagingElement createRootElement(@NotNull String artifactName); + + @NotNull + public String suggestArtifactName() { + return "unnamed"; + } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java index 093d8b6ec6ff..ba8911c93c32 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java @@ -34,7 +34,6 @@ import com.intellij.openapi.ui.MasterDetailsStateService; import com.intellij.packaging.artifacts.*; import com.intellij.packaging.elements.CompositePackagingElement; import org.jetbrains.annotations.Nls; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -49,7 +48,6 @@ import java.util.*; storages = {@Storage(id = "other", file = "$WORKSPACE_FILE$")} ) public class ArtifactsStructureConfigurable extends BaseStructureConfigurable { - @NonNls private static final String DEFAULT_ARTIFACT_NAME = "unnamed"; private ArtifactsStructureConfigurableContextImpl myPackagingEditorContext; private ArtifactEditorSettings myDefaultSettings = new ArtifactEditorSettings(); @@ -172,10 +170,11 @@ public class ArtifactsStructureConfigurable extends BaseStructureConfigurable { } private void addArtifact(@NotNull ArtifactType type, @NotNull ArtifactTemplate artifactTemplate) { - String name = DEFAULT_ARTIFACT_NAME; + final String baseName = artifactTemplate.suggestArtifactName(); + String name = baseName; int i = 2; while (myPackagingEditorContext.getArtifactModel().findArtifact(name) != null) { - name = DEFAULT_ARTIFACT_NAME + i; + name = baseName + i; i++; } final ModifiableArtifact artifact = myPackagingEditorContext.getOrCreateModifiableArtifactModel().addArtifact(name, type, artifactTemplate.createRootElement(name));