From c8699b6627e9cbd9d3c8ea65084b76e3a1046351 Mon Sep 17 00:00:00 2001
From: Nikolay Chashnikov <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 14 Jul 2008 08:47:29 +0400
Subject: [PATCH] IDEADEV-27909

---
 .../facet/impl/ProjectFacetsConfigurator.java        |  6 +++---
 .../facet/impl/ui/FacetEditorContextBase.java        | 20 +++++++++++++++-----
 .../facet/impl/ui/ProjectConfigurableContext.java    | 17 ++---------------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/source/com/intellij/facet/impl/ProjectFacetsConfigurator.java b/source/com/intellij/facet/impl/ProjectFacetsConfigurator.java
index 801421946c..72412d29a1 100644
--- a/source/com/intellij/facet/impl/ProjectFacetsConfigurator.java
+++ b/source/com/intellij/facet/impl/ProjectFacetsConfigurator.java
@@ -149,7 +149,7 @@ public class ProjectFacetsConfigurator implements FacetsProvider, ModuleEditor.C
       final Facet underlyingFacet = facet.getUnderlyingFacet();
       final FacetEditorContext parentContext = underlyingFacet != null ? getOrCreateEditor(underlyingFacet).getContext() : null;
       final ModuleConfigurationState state = myModuleStateProvider.fun(facet.getModule());
-      final ProjectConfigurableContext context = new MyProjectConfigurableContext(myFacet2Info.get(facet), facet, parentContext, state);
+      final ProjectConfigurableContext context = new MyProjectConfigurableContext(facet, parentContext, state);
       editor = new FacetEditorImpl(context, facet.getConfiguration());
       editor.getComponent();
       editor.reset();
@@ -314,8 +314,8 @@ public class ProjectFacetsConfigurator implements FacetsProvider, ModuleEditor.C
   private class MyProjectConfigurableContext extends ProjectConfigurableContext {
     private LibrariesContainer myContainer;
 
-    public MyProjectConfigurableContext(FacetInfo facetInfo, final Facet facet, final FacetEditorContext parentContext, final ModuleConfigurationState state) {
-      super(facetInfo, facet, ProjectFacetsConfigurator.this.isNewFacet(facet), parentContext, state,
+    public MyProjectConfigurableContext(final Facet facet, final FacetEditorContext parentContext, final ModuleConfigurationState state) {
+      super(facet, ProjectFacetsConfigurator.this.isNewFacet(facet), parentContext, state,
             ProjectFacetsConfigurator.this.getSharedModuleData(facet.getModule()), getProjectData());
       myContainer = LibrariesContainerFactory.createContainer(facet.getModule().getProject(), myContext);
     }
diff --git a/source/com/intellij/facet/impl/ui/FacetEditorContextBase.java b/source/com/intellij/facet/impl/ui/FacetEditorContextBase.java
index 7e77ddee96..7aa4c01366 100644
--- a/source/com/intellij/facet/impl/ui/FacetEditorContextBase.java
+++ b/source/com/intellij/facet/impl/ui/FacetEditorContextBase.java
@@ -4,7 +4,7 @@
 
 package com.intellij.facet.impl.ui;
 
-import com.intellij.facet.FacetInfo;
+import com.intellij.facet.Facet;
 import com.intellij.facet.impl.DefaultFacetsProvider;
 import com.intellij.facet.ui.FacetEditorContext;
 import com.intellij.openapi.module.Module;
@@ -32,17 +32,17 @@ public abstract class FacetEditorContextBase extends UserDataHolderBase implemen
   private FacetsProvider myFacetsProvider;
   @Nullable private final FacetEditorContext myParentContext;
   private ModulesProvider myModulesProvider;
-  private final FacetInfo myFacetInfo;
+  private final Facet myFacet;
   private UserDataHolder mySharedModuleData;
   private EventDispatcher<FacetContextChangeListener> myFacetContextChangeDispatcher = EventDispatcher.create(FacetContextChangeListener.class);
   private UserDataHolder mySharedProjectData;
 
-  public FacetEditorContextBase(@NotNull FacetInfo facetInfo, final @Nullable FacetEditorContext parentContext, final @Nullable FacetsProvider facetsProvider,
+  public FacetEditorContextBase(@NotNull Facet facet, final @Nullable FacetEditorContext parentContext, final @Nullable FacetsProvider facetsProvider,
                                 final @NotNull ModulesProvider modulesProvider,
                                 final UserDataHolder sharedModuleData,
                                 final UserDataHolder sharedProjectData) {
+    myFacet = facet;
     mySharedProjectData = sharedProjectData;
-    myFacetInfo = facetInfo;
     mySharedModuleData = sharedModuleData;
     myParentContext = parentContext;
     myModulesProvider = modulesProvider;
@@ -60,7 +60,7 @@ public abstract class FacetEditorContextBase extends UserDataHolderBase implemen
 
   @NotNull
   public String getFacetName() {
-    return myFacetInfo.getName();
+    return myFacet.getName();
   }
 
   public VirtualFile[] getLibraryFiles(final Library library, final OrderRootType rootType) {
@@ -124,4 +124,14 @@ public abstract class FacetEditorContextBase extends UserDataHolderBase implemen
   }
 
   public abstract LibrariesContainer getContainer();
+
+  @NotNull
+  public Facet getFacet() {
+    return myFacet;
+  }
+
+  @Nullable
+  public Facet getParentFacet() {
+    return myFacet.getUnderlyingFacet();
+  }
 }
diff --git a/source/com/intellij/facet/impl/ui/ProjectConfigurableContext.java b/source/com/intellij/facet/impl/ui/ProjectConfigurableContext.java
index 954ac60734..7363e89146 100644
--- a/source/com/intellij/facet/impl/ui/ProjectConfigurableContext.java
+++ b/source/com/intellij/facet/impl/ui/ProjectConfigurableContext.java
@@ -5,7 +5,6 @@
 package com.intellij.facet.impl.ui;
 
 import com.intellij.facet.Facet;
-import com.intellij.facet.FacetInfo;
 import com.intellij.facet.ui.FacetEditorContext;
 import com.intellij.facet.ui.ProjectSettingsContext;
 import com.intellij.ide.util.projectWizard.ModuleBuilder;
@@ -27,17 +26,15 @@ import org.jetbrains.annotations.Nullable;
  */
 public abstract class ProjectConfigurableContext extends FacetEditorContextBase implements ProjectSettingsContext {
   private Module myModule;
-  private final Facet myFacet;
   private boolean myNewFacet;
   private ModuleConfigurationState myModuleConfigurationState;
 
-  public ProjectConfigurableContext(final @NotNull FacetInfo facetInfo, final @NotNull Facet facet, final boolean isNewFacet,
+  public ProjectConfigurableContext(final @NotNull Facet facet, final boolean isNewFacet,
                                     @Nullable FacetEditorContext parentContext,
                                     final ModuleConfigurationState state, final UserDataHolder sharedModuleData,
                                     final UserDataHolder sharedProjectData) {
-    super(facetInfo, parentContext, state.getFacetsProvider(), state.getModulesProvider(), sharedModuleData, sharedProjectData);
+    super(facet, parentContext, state.getFacetsProvider(), state.getModulesProvider(), sharedModuleData, sharedProjectData);
     myModuleConfigurationState = state;
-    myFacet = facet;
     myNewFacet = isNewFacet;
     myModule = facet.getModule();
   }
@@ -62,16 +59,6 @@ public abstract class ProjectConfigurableContext extends FacetEditorContextBase
   }
 
   @NotNull
-  public Facet getFacet() {
-    return myFacet;
-  }
-
-  @Nullable
-  public Facet getParentFacet() {
-    return myFacet.getUnderlyingFacet();
-  }
-
-  @NotNull
   public ModifiableRootModel getModifiableRootModel() {
     return myModuleConfigurationState.getRootModel();
   }
-- 
2.11.4.GIT