1 files changed, 6 insertions, 8 deletions

diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/impl/FrameworkSupportModelBase.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/impl/FrameworkSupportModelBase.java
index 3ac7333ce294..aa109764df9e 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/impl/FrameworkSupportModelBase.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/impl/FrameworkSupportModelBase.java
@@ -17,10 +17,8 @@ package com.intellij.ide.util.newProjectWizard.impl;
 
 import com.intellij.facet.impl.ui.libraries.FrameworkLibraryProvider;
 import com.intellij.framework.FrameworkVersion;
-import com.intellij.framework.PresentableVersion;
 import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider;
 import com.intellij.framework.addSupport.FrameworkVersionListener;
-import com.intellij.framework.library.FrameworkLibraryVersion;
 import com.intellij.ide.util.frameworkSupport.FrameworkSupportConfigurable;
 import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel;
 import com.intellij.ide.util.frameworkSupport.FrameworkSupportModelListener;
@@ -55,7 +53,7 @@ public abstract class FrameworkSupportModelBase extends UserDataHolderBase imple
   private final Map<String, FrameworkSupportNode> mySettingsMap = new HashMap<String, FrameworkSupportNode>();
   private final Map<String, FrameworkSupportOptionsComponent> myOptionsComponentsMap = new HashMap<String, FrameworkSupportOptionsComponent>();
   private final Map<String, FrameworkVersion> mySelectedVersions = new HashMap<String, FrameworkVersion>();
-  private final Map<String, FrameworkLibraryVersion> myLibraryVersions = new HashMap<String, FrameworkLibraryVersion>();
+  private final Map<String, String> myFrameworkVersions = new HashMap<String, String>();
   private FrameworkLibraryProvider myLibraryProvider;
 
   public FrameworkSupportModelBase(final @Nullable Project project, @Nullable ModuleBuilder builder, @NotNull LibrariesContainer librariesContainer) {
@@ -169,7 +167,7 @@ public abstract class FrameworkSupportModelBase extends UserDataHolderBase imple
     return myLibraryProvider;
   }
 
-  public void setLibraryProvider(FrameworkLibraryProvider libraryProvider) {
+  public void setLibraryProvider(@Nullable FrameworkLibraryProvider libraryProvider) {
     myLibraryProvider = libraryProvider;
     for (FrameworkSupportOptionsComponent optionsComponent : myOptionsComponentsMap.values()) {
       optionsComponent.updateLibrariesPanel();
@@ -205,13 +203,13 @@ public abstract class FrameworkSupportModelBase extends UserDataHolderBase imple
     return myLibrariesContainer;
   }
 
-  public void setSelectedLibraryVersion(String id, FrameworkLibraryVersion version) {
-    myLibraryVersions.put(id, version);
+  public void setSelectedLibraryVersion(String id, String version) {
+    myFrameworkVersions.put(id, version);
     myVersionEventDispatcher.getMulticaster().versionChanged(getSelectedVersion(id));
   }
 
-  public PresentableVersion getPresentableVersion(String id) {
+  public String getFrameworkVersion(String id) {
     FrameworkVersion version = mySelectedVersions.get(id);
-    return version == null ? myLibraryVersions.get(id) : version;
+    return version == null ? myFrameworkVersions.get(id) : version.getVersionNumber();
   }
 }