From 2f2e923fbfdbea42f7c63e485534ad1bf8292e2b Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Mon, 25 Feb 2013 14:38:08 +0400
Subject: [PATCH] project templates: choosing app server

---
 .../openapi/module/BasePackageParameterFactory.java       | 2 +-
 .../projectWizard/ProjectTemplateParameterFactory.java    | 1 +
 .../src/com/intellij/execution/impl/RunManagerImpl.java   | 8 +++++++-
 .../src/com/intellij/ui/CollectionComboBoxModel.java      | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/openapi/module/BasePackageParameterFactory.java b/java/java-impl/src/com/intellij/openapi/module/BasePackageParameterFactory.java
index e2f3308f7ef2..809f65d80d7d 100644
--- a/java/java-impl/src/com/intellij/openapi/module/BasePackageParameterFactory.java
+++ b/java/java-impl/src/com/intellij/openapi/module/BasePackageParameterFactory.java
@@ -60,7 +60,7 @@ public class BasePackageParameterFactory extends ProjectTemplateParameterFactory
 
       @Override
       public String getLabel() {
-        return "Base package:";
+        return "Base \u001Bpackage:";
       }
 
       @Override
diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java
index 408c51870736..1a9026daf136 100644
--- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java
+++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java
@@ -30,6 +30,7 @@ public abstract class ProjectTemplateParameterFactory {
   // standard ids
   public static final String IJ_BASE_PACKAGE = "IJ_BASE_PACKAGE";
   public static final String IJ_PROJECT_NAME = "IJ_PROJECT_NAME";
+  public static final String IJ_APPLICATION_SERVER = "IJ_APPLICATION_SERVER";
 
   public abstract String getParameterId();
 
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
index 58ae0b7e4d9a..876a4303f50c 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
@@ -19,6 +19,7 @@ package com.intellij.execution.impl;
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
 import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.ide.util.projectWizard.ProjectTemplateComponent;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
@@ -39,7 +40,7 @@ import javax.swing.*;
 import java.util.*;
 
 
-public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, ProjectComponent {
+public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, ProjectComponent, ProjectTemplateComponent {
   private final Project myProject;
 
   private final Map<String, ConfigurationType> myTypesByName = new LinkedHashMap<String, ConfigurationType>();
@@ -1140,4 +1141,9 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable,
       myProviderKeysMap.put(id.toString(), id);
     }
   }
+
+  @Override
+  public String getStorageFile() {
+    return "workspace.xml";
+  }
 }
diff --git a/platform/platform-api/src/com/intellij/ui/CollectionComboBoxModel.java b/platform/platform-api/src/com/intellij/ui/CollectionComboBoxModel.java
index 162bb82a1e42..51703470e7cf 100644
--- a/platform/platform-api/src/com/intellij/ui/CollectionComboBoxModel.java
+++ b/platform/platform-api/src/com/intellij/ui/CollectionComboBoxModel.java
@@ -32,6 +32,10 @@ public class CollectionComboBoxModel extends AbstractCollectionComboBoxModel {
     myItems = Collections.unmodifiableList(items);
   }
 
+  public CollectionComboBoxModel(List items) {
+    super(items.isEmpty() ? null : items.get(0));
+    myItems = items;
+  }
 
   @NotNull
   final protected List getItems() {