From af0edeceb5ca492dd4adefc9f989a126f8d0a711 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Wed, 3 Oct 2012 15:12:36 +0400
Subject: [PATCH] showing file name

---
 .../ide/util/newProjectWizard/SelectTemplateStep.java       | 3 ++-
 .../platform/templates/ArchivedProjectTemplate.java         | 1 +
 .../platform/templates/ArchivedTemplatesFactory.java        | 6 ++++--
 .../AbstractGithubTagDownloadedProjectGenerator.java        | 1 +
 .../src/com/intellij/platform/ProjectTemplate.java          | 1 +
 .../src/com/intellij/platform/WebProjectGenerator.java      | 1 +
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java
index 4ba670470fae..99b710e74f4f 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java
@@ -19,6 +19,7 @@ import com.intellij.ide.util.projectWizard.ModuleWizardStep;
 import com.intellij.ide.util.projectWizard.WizardContext;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.platform.ProjectTemplate;
 import com.intellij.platform.ProjectTemplatesFactory;
 import com.intellij.psi.codeStyle.MinusculeMatcher;
@@ -86,7 +87,7 @@ public class SelectTemplateStep extends ModuleWizardStep {
           mySettingsPanel.setVisible(settingsPanel != null);
           String description = template.getDescription();
           myDescriptionPane.setText(description);
-          myDescriptionPanel.setVisible(description != null);
+          myDescriptionPanel.setVisible(StringUtil.isNotEmpty(description));
         }
         mySettingsPanel.revalidate();
         mySettingsPanel.repaint();
diff --git a/java/idea-ui/src/com/intellij/platform/templates/ArchivedProjectTemplate.java b/java/idea-ui/src/com/intellij/platform/templates/ArchivedProjectTemplate.java
index f26ea034eecd..2fa05510dcf4 100644
--- a/java/idea-ui/src/com/intellij/platform/templates/ArchivedProjectTemplate.java
+++ b/java/idea-ui/src/com/intellij/platform/templates/ArchivedProjectTemplate.java
@@ -60,6 +60,7 @@ public class ArchivedProjectTemplate implements ProjectTemplate {
     myContext = context;
   }
 
+  @NotNull
   @Override
   public String getName() {
     return myDisplayName;
diff --git a/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java b/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java
index 639d3f941891..0cbca9eb0086 100644
--- a/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java
+++ b/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java
@@ -34,6 +34,8 @@ import java.util.*;
  */
 public class ArchivedTemplatesFactory implements ProjectTemplatesFactory {
 
+  private static final String ZIP = ".zip";
+
   @NotNull
   @Override
   public ProjectTemplate[] createTemplates(WizardContext context) {
@@ -55,9 +57,9 @@ public class ArchivedTemplatesFactory implements ProjectTemplatesFactory {
       try {
         final List<String> children = UrlUtil.getChildrenRelativePaths(url);
         for (String child : children) {
-          if (child.endsWith(".zip")) {
+          if (child.endsWith(ZIP)) {
             final URL templateUrl = new URL(url.toExternalForm() + "/" + child);
-            templates.add(new ArchivedProjectTemplate(child, templateUrl, context));
+            templates.add(new ArchivedProjectTemplate(child.substring(0, child.length() - ZIP.length()), templateUrl, context));
           }
         }
       }
diff --git a/platform/lang-impl/src/com/intellij/lang/javascript/boilerplate/AbstractGithubTagDownloadedProjectGenerator.java b/platform/lang-impl/src/com/intellij/lang/javascript/boilerplate/AbstractGithubTagDownloadedProjectGenerator.java
index 6871b4ca921f..5dcc2124370b 100644
--- a/platform/lang-impl/src/com/intellij/lang/javascript/boilerplate/AbstractGithubTagDownloadedProjectGenerator.java
+++ b/platform/lang-impl/src/com/intellij/lang/javascript/boilerplate/AbstractGithubTagDownloadedProjectGenerator.java
@@ -24,6 +24,7 @@ public abstract class AbstractGithubTagDownloadedProjectGenerator extends WebPro
 
   private static final Logger LOG = Logger.getInstance(AbstractGithubTagDownloadedProjectGenerator.class);
 
+  @NotNull
   @Nls
   @Override
   public final String getName() {
diff --git a/platform/platform-impl/src/com/intellij/platform/ProjectTemplate.java b/platform/platform-impl/src/com/intellij/platform/ProjectTemplate.java
index 5ba1f8bafa51..ff523b80eb36 100644
--- a/platform/platform-impl/src/com/intellij/platform/ProjectTemplate.java
+++ b/platform/platform-impl/src/com/intellij/platform/ProjectTemplate.java
@@ -27,6 +27,7 @@ import javax.swing.*;
  */
 public interface ProjectTemplate {
 
+  @NotNull
   String getName();
 
   @Nullable
diff --git a/platform/platform-impl/src/com/intellij/platform/WebProjectGenerator.java b/platform/platform-impl/src/com/intellij/platform/WebProjectGenerator.java
index 1174b6c70a0c..fd61e900b344 100644
--- a/platform/platform-impl/src/com/intellij/platform/WebProjectGenerator.java
+++ b/platform/platform-impl/src/com/intellij/platform/WebProjectGenerator.java
@@ -38,6 +38,7 @@ import javax.swing.*;
  */
 public abstract class WebProjectGenerator<T> implements DirectoryProjectGenerator<T> {
 
+  @NotNull
   @Nls
   @Override
   public abstract String getName();