From df2e5b595ada1da811d33695d41da054e8d06918 Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 4 Jul 2011 16:17:45 +0400 Subject: [PATCH] fixed libraries for ejb version without ejb-jar.xml (IDEA-71718) --- .../ui/libraries/LibraryCompositionSettings.java | 16 +++++++--------- .../impl/ui/libraries/LibraryOptionsPanel.java | 4 ++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java index 8df983fde33f..727682cc79c4 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java @@ -73,15 +73,13 @@ public class LibraryCompositionSettings implements Disposable { public void updateDownloadableVersions(@Nullable FrameworkVersion version) { myCurrentFrameworkVersion = version; - if (version != null && myDownloadSettings != null) { - if (!myDownloadSettings.getVersion().isCompatibleWith(version)) { - final FrameworkLibraryVersion newLibraryVersion = ContainerUtil.getFirstItem(getCompatibleVersions()); - if (newLibraryVersion != null) { - myDownloadSettings = createDownloadSettings(newLibraryVersion); - } - else { - myDownloadSettings = null; - } + if (version != null && (myDownloadSettings == null || !myDownloadSettings.getVersion().isCompatibleWith(version))) { + final FrameworkLibraryVersion newLibraryVersion = ContainerUtil.getFirstItem(getCompatibleVersions()); + if (newLibraryVersion != null) { + myDownloadSettings = createDownloadSettings(newLibraryVersion); + } + else { + myDownloadSettings = null; } } } diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java index c6e5d00e3f5b..c118873b27c2 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java @@ -290,6 +290,10 @@ public class LibraryOptionsPanel implements Disposable { private void updateState() { myMessageLabel.setIcon(null); myConfigureButton.setVisible(true); + myDownloadRadioButton.setEnabled(mySettings.getDownloadSettings() != null); + if (!myDownloadRadioButton.isEnabled() && myDownloadRadioButton.isSelected() && myUseLibraryRadioButton.isVisible()) { + myUseLibraryRadioButton.setSelected(true); + } String message = ""; boolean showConfigurePanel = true; switch (myButtonEnumModel.getSelected()) {