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

IDEA-61567: Groovy and grails New SDK not stored for later use (regression) [rev by peter]

Browse Source
This commit is contained in:
nik
2010-12-02 16:51:06 +03:00
parent c7beb63031
commit 27df914184
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java
+2 -3
View File
@@ -17,7 +17,6 @@ package com.intellij.facet.impl.ui.libraries;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription;
import com.intellij.openapi.roots.ui.configuration.libraries.LibraryDownloadDescription;
@@ -26,7 +25,6 @@ import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEdito
import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainer;
import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainerFactory;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -41,7 +39,7 @@ import java.util.Map;
public class LibraryCompositionSettings implements Disposable {
private final CustomLibraryDescription myLibraryDescription;
private final String myBaseDirectoryPath;
private LibrariesContainer.LibraryLevel myNewLibraryLevel = LibrariesContainer.LibraryLevel.PROJECT;
private LibrariesContainer.LibraryLevel myNewLibraryLevel;
private NewLibraryEditor myNewLibraryEditor;
private Library mySelectedLibrary;
private boolean myDownloadLibraries;
@@ -51,6 +49,7 @@ public class LibraryCompositionSettings implements Disposable {
public LibraryCompositionSettings(final @NotNull CustomLibraryDescription libraryDescription,
final @NotNull String baseDirectoryFiles) {
myLibraryDescription = libraryDescription;
myNewLibraryLevel = libraryDescription.getDefaultLevel();
myBaseDirectoryPath = baseDirectoryFiles;
final LibraryDownloadDescription downloadDescription = myLibraryDescription.getDownloadDescription();
if (downloadDescription != null) {
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/CustomLibraryDescription.java
+6
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.openapi.roots.ui.configuration.libraries;
import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainer;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
@@ -37,4 +38,9 @@ public abstract class CustomLibraryDescription {
@Nullable
public abstract NewLibraryConfiguration createNewLibrary(@NotNull JComponent parentComponent, @Nullable VirtualFile contextDirectory);
@NotNull
public LibrariesContainer.LibraryLevel getDefaultLevel() {
return LibrariesContainer.LibraryLevel.PROJECT;
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyLibraryDescription.java
+7
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescri
import com.intellij.openapi.roots.ui.configuration.libraries.LibraryPresentationManager;
import com.intellij.openapi.roots.ui.configuration.libraries.NewLibraryConfiguration;
import com.intellij.openapi.roots.ui.configuration.libraryEditor.LibraryEditor;
import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainer;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
@@ -149,4 +150,10 @@ public class GroovyLibraryDescription extends CustomLibraryDescription {
}
};
}
@NotNull
@Override
public LibrariesContainer.LibraryLevel getDefaultLevel() {
return LibrariesContainer.LibraryLevel.GLOBAL;
}
}