From 002eadb1eaca937f487266692f9a6deadcc2a89b Mon Sep 17 00:00:00 2001
From: Serega Vasiliev <sergey.vasiliev@jetbrains.com>
Date: Thu, 5 Sep 2013 16:27:17 +0200
Subject: [PATCH] javaee libs,project structure, etc.

---
 .../OldCustomLibraryDescription.java               |  4 +++-
 .../library/impl/FrameworkLibraryVersionImpl.java  | 14 ++++++++++----
 .../library/impl/LibraryVersionsFetcher.java       |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/OldCustomLibraryDescription.java b/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/OldCustomLibraryDescription.java
index 70a452dbb1c7..6459f26b0328 100644
--- a/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/OldCustomLibraryDescription.java
+++ b/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/OldCustomLibraryDescription.java
@@ -62,7 +62,9 @@ public class OldCustomLibraryDescription extends CustomLibraryDescriptionBase {
                                                                    downloadingInfo.getFileNameSuffix(), null, null, false));
         }
       }
-      libraryVersions.add(new FrameworkLibraryVersionImpl(version.getVersionName(), FrameworkAvailabilityCondition.ALWAYS_TRUE, downloads, version.getLibraryName()));
+      String libraryName = version.getLibraryName();
+      libraryVersions.add(new FrameworkLibraryVersionImpl(libraryName, version.getVersionName(), FrameworkAvailabilityCondition.ALWAYS_TRUE, downloads,
+                                                          libraryName));
     }
     myDownloadableDescription = !libraryVersions.isEmpty() ? new DownloadableLibraryDescriptionImpl(libraryVersions) : null;
   }
diff --git a/platform/lang-impl/src/com/intellij/framework/library/impl/FrameworkLibraryVersionImpl.java b/platform/lang-impl/src/com/intellij/framework/library/impl/FrameworkLibraryVersionImpl.java
index 09d35855d138..9a265a198544 100644
--- a/platform/lang-impl/src/com/intellij/framework/library/impl/FrameworkLibraryVersionImpl.java
+++ b/platform/lang-impl/src/com/intellij/framework/library/impl/FrameworkLibraryVersionImpl.java
@@ -18,8 +18,10 @@ package com.intellij.framework.library.impl;
 import com.intellij.framework.library.DownloadableLibraryFileDescription;
 import com.intellij.framework.FrameworkAvailabilityCondition;
 import com.intellij.framework.library.FrameworkLibraryVersion;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.download.impl.DownloadableFileSetDescriptionImpl;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -27,14 +29,17 @@ import java.util.List;
  * @author nik
  */
 public class FrameworkLibraryVersionImpl extends DownloadableFileSetDescriptionImpl<DownloadableLibraryFileDescription> implements FrameworkLibraryVersion {
+  @Nullable private final String myLibraryName;
   @NotNull private final FrameworkAvailabilityCondition myAvailabilityCondition;
   private final String myLibraryCategory;
 
-  public FrameworkLibraryVersionImpl(String versionString,
+  public FrameworkLibraryVersionImpl(@Nullable String libraryName,
+                                     @NotNull String versionString,
                                      @NotNull FrameworkAvailabilityCondition availabilityCondition,
-                                     List<DownloadableLibraryFileDescription> libraryFiles,
-                                     String category) {
+                                     @NotNull List<DownloadableLibraryFileDescription> libraryFiles,
+                                     @NotNull String category) {
     super(category, versionString, libraryFiles);
+    myLibraryName = libraryName;
     myAvailabilityCondition = availabilityCondition;
     myLibraryCategory = category;
   }
@@ -47,6 +52,7 @@ public class FrameworkLibraryVersionImpl extends DownloadableFileSetDescriptionI
   @NotNull
   @Override
   public String getDefaultLibraryName() {
-    return myVersionString.length() > 0 ? myLibraryCategory + "-" + myVersionString : myLibraryCategory;
+    String libName = StringUtil.isEmptyOrSpaces(myLibraryName) ? myLibraryCategory : myLibraryName;
+    return myVersionString.length() > 0 ? libName + "-" + myVersionString : myLibraryCategory;
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/framework/library/impl/LibraryVersionsFetcher.java b/platform/lang-impl/src/com/intellij/framework/library/impl/LibraryVersionsFetcher.java
index 9896d347e2ef..f8360f9c55c8 100644
--- a/platform/lang-impl/src/com/intellij/framework/library/impl/LibraryVersionsFetcher.java
+++ b/platform/lang-impl/src/com/intellij/framework/library/impl/LibraryVersionsFetcher.java
@@ -40,7 +40,7 @@ public class LibraryVersionsFetcher extends FileSetVersionsFetcherBase<Framework
 
   @Override
   protected FrameworkLibraryVersion createVersion(Artifact version, List<DownloadableLibraryFileDescription> files) {
-    return new FrameworkLibraryVersionImpl(version.getVersion(), createAvailabilityCondition(version), files, myGroupId);
+    return new FrameworkLibraryVersionImpl(version.getName(), version.getVersion(), createAvailabilityCondition(version), files, myGroupId);
   }
 
   @NotNull