From 1c731c982b85db2685b3678bbb614767f80be6dd Mon Sep 17 00:00:00 2001
From: greg <Gregory.Shrago@jetbrains.com>
Date: Tue, 7 Jul 2009 20:18:37 +0400
Subject: [PATCH] downloadable Java EE jars; j2ee.jar, javaee.jar, javaee_6.jar
 removed from dist

---
 openapi/src/com/intellij/facet/ui/FacetEditorsFactory.java     |  4 ++++
 source/com/intellij/facet/impl/ui/FacetEditorsFactoryImpl.java |  6 +++++-
 .../facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java   | 10 ++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/openapi/src/com/intellij/facet/ui/FacetEditorsFactory.java b/openapi/src/com/intellij/facet/ui/FacetEditorsFactory.java
index dbdc199fc2..4be7147fa3 100644
--- a/openapi/src/com/intellij/facet/ui/FacetEditorsFactory.java
+++ b/openapi/src/com/intellij/facet/ui/FacetEditorsFactory.java
@@ -35,6 +35,10 @@ public abstract class FacetEditorsFactory {
                                                                    FacetEditorContext context,
                                                                    final FacetValidatorsManager validatorsManager);
 
+  public abstract FacetLibrariesValidator createLibrariesValidator(@NotNull final LibraryInfo[] libraries,
+                                                                   @NotNull final Module module,
+                                                                   @NotNull final String libraryName);
+
   public abstract LibrariesValidationComponent createLibrariesValidationComponent(LibraryInfo[] libraryInfos, Module module, 
                                                                          String defaultLibraryName);
 
diff --git a/source/com/intellij/facet/impl/ui/FacetEditorsFactoryImpl.java b/source/com/intellij/facet/impl/ui/FacetEditorsFactoryImpl.java
index 7ee9ce0c5b..1dcb424155 100644
--- a/source/com/intellij/facet/impl/ui/FacetEditorsFactoryImpl.java
+++ b/source/com/intellij/facet/impl/ui/FacetEditorsFactoryImpl.java
@@ -24,7 +24,11 @@ public class FacetEditorsFactoryImpl extends FacetEditorsFactory {
     return new FacetLibrariesValidatorImpl(libraries, description, new DelegatingLibrariesValidatorContext(context), validatorsManager);
   }
 
-  public LibrariesValidationComponent createLibrariesValidationComponent(LibraryInfo[] libraryInfos, Module module, 
+  public FacetLibrariesValidator createLibrariesValidator(@NotNull final LibraryInfo[] libraries, @NotNull final Module module, @NotNull final String libraryName) {
+    return new FacetLibrariesValidatorImpl(libraries, new FacetLibrariesValidatorDescription(libraryName), new LibrariesValidatorContextImpl(module), null);
+  }
+
+  public LibrariesValidationComponent createLibrariesValidationComponent(LibraryInfo[] libraryInfos, Module module,
                                                                          String defaultLibraryName) {
     return new LibrariesValidationComponentImpl(libraryInfos, module, defaultLibraryName);
   }
diff --git a/source/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java b/source/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java
index 3ee3bd2236..8ab7d968aa 100644
--- a/source/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java
+++ b/source/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java
@@ -80,7 +80,9 @@ public class FacetLibrariesValidatorImpl extends FacetLibrariesValidator {
   }
 
   private void onChange() {
-    myValidatorsManager.validate();
+    if (myValidatorsManager != null) {
+      myValidatorsManager.validate();
+    }
   }
 
   public void onFacetInitialized(Facet facet) {
@@ -167,15 +169,15 @@ public class FacetLibrariesValidatorImpl extends FacetLibrariesValidator {
 
     protected void doOKAction() {
       myPanel.apply();
-      LibraryCompositionSettings settings = myPanel.getLibraryCompositionSettings();
-      LibrariesContainer librariesContainer = myContext.getLibrariesContainer();
+      final LibraryCompositionSettings settings = myPanel.getLibraryCompositionSettings();
+      final LibrariesContainer librariesContainer = myContext.getLibrariesContainer();
       if (settings.downloadFiles(myMirrorsMap, librariesContainer, myPanel.getMainPanel())) {
         ModifiableRootModel rootModel = myContext.getModifiableRootModel();
         if (rootModel == null) {
           final ModifiableRootModel model = ModuleRootManager.getInstance(myContext.getModule()).getModifiableModel();
-          settings.addLibraries(model, myAddedLibraries, librariesContainer);
           new WriteAction() {
             protected void run(final Result result) {
+              settings.addLibraries(model, myAddedLibraries, librariesContainer);
               model.commit();
             }
           }.execute();
-- 
2.11.4.GIT