From 901669b0b59b71dc6513138babcac83a0f840e35 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Thu, 12 Jun 2014 12:52:31 +0400
Subject: [PATCH] added logos for twitter bootstrap and boilerplate. Use
 renamed getIcon to getLogo to not mess with IDEA project creation

---
 .../intellij/ide/util/projectWizard/WebProjectTemplate.java   | 4 ++++
 .../src/com/intellij/platform/DirectoryProjectGenerator.java  | 2 +-
 .../python/newProject/PythonBaseProjectGenerator.java         | 2 +-
 .../python/newProject/PythonNewDirectoryProjectDialog.java    | 2 +-
 .../newProject/actions/AbstractProjectSettingsStep.java       | 2 +-
 .../python/newProject/actions/ProjectSpecificAction.java      | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebProjectTemplate.java b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebProjectTemplate.java
index 9373c7b28c91..988183e9cbe9 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebProjectTemplate.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebProjectTemplate.java
@@ -58,6 +58,10 @@ public abstract class WebProjectTemplate<T> extends WebProjectGenerator<T> imple
     return WebModuleBuilder.ICON;
   }
 
+  public Icon getLogo() {
+    return WebModuleBuilder.ICON;
+  }
+
   @NotNull
   public GeneratorPeer<T> getPeer() {
     return myPeerHolder.getValue();
diff --git a/platform/platform-impl/src/com/intellij/platform/DirectoryProjectGenerator.java b/platform/platform-impl/src/com/intellij/platform/DirectoryProjectGenerator.java
index fe98588d6b63..545d01a43582 100644
--- a/platform/platform-impl/src/com/intellij/platform/DirectoryProjectGenerator.java
+++ b/platform/platform-impl/src/com/intellij/platform/DirectoryProjectGenerator.java
@@ -48,7 +48,7 @@ public interface DirectoryProjectGenerator<T> {
   T getProjectSettings() throws ProcessCanceledException;
 
   @Nullable
-  Icon getIcon();
+  Icon getLogo();
 
   void generateProject(@NotNull final Project project, @NotNull final VirtualFile baseDir,
                        @Nullable final T settings, @NotNull final Module module);
diff --git a/python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java b/python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java
index 0debab268799..63784335db40 100644
--- a/python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java
+++ b/python/ide/src/com/jetbrains/python/newProject/PythonBaseProjectGenerator.java
@@ -43,7 +43,7 @@ public class PythonBaseProjectGenerator implements DirectoryProjectGenerator {
 
   @Nullable
   @Override
-  public Icon getIcon() {
+  public Icon getLogo() {
     return PythonIcons.Python.Python_logo;
   }
 
diff --git a/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectDialog.java b/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectDialog.java
index 098fbaee246a..13f22f8c50b2 100644
--- a/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectDialog.java
+++ b/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectDialog.java
@@ -194,7 +194,7 @@ public class PythonNewDirectoryProjectDialog extends NewDirectoryProjectDialog {
 
       @Nullable
       @Override
-      public Icon getIcon() {
+      public Icon getLogo() {
         return null;
       }
 
diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java b/python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java
index 15612fd00d5e..eb9e18d57708 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java
+++ b/python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java
@@ -134,7 +134,7 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
   }
 
   protected Icon getIcon() {
-    return myProjectGenerator.getIcon();
+    return myProjectGenerator.getLogo();
   }
 
   private JPanel createBasePanel() {
diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificAction.java b/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificAction.java
index a2fa66dc4834..950e11e0beca 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificAction.java
+++ b/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificAction.java
@@ -30,7 +30,7 @@ public class ProjectSpecificAction extends DefaultActionGroup implements DumbAwa
   public ProjectSpecificAction(@NotNull final NullableConsumer<AbstractProjectSettingsStep> callback,
                                @NotNull final DirectoryProjectGenerator projectGenerator) {
     super(projectGenerator.getName(), true);
-    getTemplatePresentation().setIcon(projectGenerator.getIcon());
+    getTemplatePresentation().setIcon(projectGenerator.getLogo());
     mySettings = new ProjectSpecificSettingsStep(projectGenerator, callback);
     add(mySettings);
   }