From d5195382fa52230dbbfcb7a56aa9341bd69a2746 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 5 Mar 2013 13:13:32 +0400 Subject: [PATCH] Don't store library version in bundled runtime --- .../jet/plugin/framework/JSLibraryDescription.java | 5 +---- .../jet/plugin/framework/JavaRuntimeLibraryDescription.java | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryDescription.java b/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryDescription.java index f8adb5c5ffa..bf15ddf3188 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryDescription.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryDescription.java @@ -69,8 +69,6 @@ public class JSLibraryDescription extends CustomLibraryDescription { return null; } - String libraryName = LIBRARY_NAME; - String copyIntoPath = dialog.getCopyIntoPath(); if (copyIntoPath != null) { List copyFiles = new ArrayList(); @@ -86,12 +84,11 @@ public class JSLibraryDescription extends CustomLibraryDescription { if (dialog.isCopyLibraryFiles()) { libraryFile = copiedFiles.get(libraryFile); - libraryName = LIBRARY_NAME + "-" + JetPluginUtil.getPluginVersion(); } } final String libraryFileUrl = VfsUtil.getUrlForLibraryRoot(libraryFile); - return new NewLibraryConfiguration(libraryName, getDownloadableLibraryType(), new LibraryVersionProperties()) { + return new NewLibraryConfiguration(LIBRARY_NAME, getDownloadableLibraryType(), new LibraryVersionProperties()) { @Override public void addRoots(@NotNull LibraryEditor editor) { editor.addRoot(libraryFileUrl, OrderRootType.CLASSES); diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java b/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java index 961baf0753f..dcacc91a0a1 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java @@ -68,20 +68,16 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescription { return null; } - String libraryName = LIBRARY_NAME; - String copyIntoPath = dialog.getCopyIntoPath(); if (copyIntoPath != null) { libraryFile = FileUIUtils.copyWithOverwriteDialog(parentComponent, JAVA_RUNTIME_LIBRARY_CREATION, copyIntoPath, libraryFile); if (libraryFile == null) { return null; } - - libraryName = LIBRARY_NAME + "-" + JetPluginUtil.getPluginVersion(); } final String libraryFileUrl = VfsUtil.getUrlForLibraryRoot(libraryFile); - return new NewLibraryConfiguration(libraryName, getDownloadableLibraryType(), new LibraryVersionProperties()) { + return new NewLibraryConfiguration(LIBRARY_NAME, getDownloadableLibraryType(), new LibraryVersionProperties()) { @Override public void addRoots(@NotNull LibraryEditor editor) { editor.addRoot(libraryFileUrl, OrderRootType.CLASSES);