From 168aa6558f2c81f6513e8f2e6de718c63a05837f Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Mon, 21 Sep 2009 16:09:01 +0400
Subject: [PATCH] "create web.xml" option

---
 .../newProjectWizard/AddSupportForFrameworksPanel.java     | 14 +++++++++-----
 .../frameworkSupport/FrameworkSupportConfigurable.java     |  3 +--
 .../frameworkSupport/FrameworkSupportConfigurableBase.form |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
index e459636d7b..a9d3397b78 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
@@ -4,18 +4,18 @@
 
 package com.intellij.ide.util.newProjectWizard;
 
-import com.intellij.facet.ui.FacetBasedFrameworkSupportProvider;
 import com.intellij.facet.impl.ui.libraries.LibraryCompositionOptionsPanel;
 import com.intellij.facet.impl.ui.libraries.LibraryCompositionSettings;
 import com.intellij.facet.impl.ui.libraries.LibraryDownloadingMirrorsMap;
+import com.intellij.facet.ui.FacetBasedFrameworkSupportProvider;
 import com.intellij.facet.ui.libraries.LibraryDownloadInfo;
 import com.intellij.facet.ui.libraries.LibraryInfo;
 import com.intellij.facet.ui.libraries.RemoteRepositoryInfo;
+import com.intellij.ide.util.frameworkSupport.FrameworkSupportConfigurable;
+import com.intellij.ide.util.frameworkSupport.FrameworkSupportConfigurableListener;
 import com.intellij.ide.util.frameworkSupport.FrameworkSupportProvider;
 import com.intellij.ide.util.newProjectWizard.impl.FrameworkSupportModelImpl;
 import com.intellij.ide.util.projectWizard.ModuleBuilder;
-import com.intellij.ide.util.frameworkSupport.FrameworkSupportConfigurable;
-import com.intellij.ide.util.frameworkSupport.FrameworkSupportConfigurableListener;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ModifiableRootModel;
@@ -28,8 +28,9 @@ import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.MultiValuesMap;
 import com.intellij.openapi.util.Pair;
 import com.intellij.ui.CheckedTreeNode;
+import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.ScrollPaneFactory;
-import com.intellij.ui.TitledSeparator;
+import com.intellij.ui.SeparatorFactory;
 import com.intellij.util.graph.CachingSemiGraph;
 import com.intellij.util.graph.DFSTBuilder;
 import com.intellij.util.graph.GraphGenerator;
@@ -154,7 +155,10 @@ public class AddSupportForFrameworksPanel {
     final String id = node.getProvider().getId();
     if (!myInitializedOptionsPanelIds.contains(id)) {
       final JPanel optionsPanel = new JPanel(new VerticalFlowLayout());
-      optionsPanel.add(new TitledSeparator(node.getTitle() + " Settings"));
+      JComponent separator = SeparatorFactory.createSeparator(node.getTitle() + " Settings", null);
+      separator.setBorder(IdeBorderFactory.createEmptyBorder(0, 0, 5, 5));
+
+      optionsPanel.add(separator);
       final FrameworkSupportConfigurable configurable = node.getConfigurable();
       optionsPanel.add(configurable.getComponent());
       final JPanel librariesOptionsPanelWrapper = new JPanel(new BorderLayout());
diff --git a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurable.java b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurable.java
index ca2b0a3531..43ecc84219 100644
--- a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurable.java
+++ b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurable.java
@@ -24,8 +24,7 @@ public abstract class FrameworkSupportConfigurable {
 
   public abstract void addSupport(@NotNull Module module, @NotNull ModifiableRootModel model, final @Nullable Library library);
 
-
-  @Nullable
+  @SuppressWarnings({"ConstantConditions"})
   public FrameworkVersion getSelectedVersion() {
     return null;
   }
diff --git a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.form b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.form
index f8d22d8ab1..136dfc64d4 100644
--- a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.form
+++ b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.ide.util.frameworkSupport.FrameworkSupportConfigurableBase">
-  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="2" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="500" height="27"/>
-- 
2.11.4.GIT