MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

javaee libs,project structure, etc.

Browse Source
This commit is contained in:
Serega Vasiliev
2013-09-05 16:34:58 +02:00
parent 559ab965eb
commit 002eadb1ea
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/util/frameworkSupport/OldCustomLibraryDescription.java
+3 -1
View File
@@ -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;
}
platform/lang-impl/src/com/intellij/framework/library/impl/FrameworkLibraryVersionImpl.java
+10 -4
View File
@@ -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;
}
}
platform/lang-impl/src/com/intellij/framework/library/impl/LibraryVersionsFetcher.java
+1 -1
View File
@@ -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