Snapshot idea/138.1029 from git://git.jetbrains.org/idea/community.git

Update from idea/138.538 to idea/138.1029

Change-Id: I828f829a968439a99ec67640990c18ff7c9b58ce

1 files changed, 7 insertions, 7 deletions

diff --git a/java/idea-ui/src/com/intellij/ide/projectView/actions/CreateLibraryFromFilesDialog.java b/java/idea-ui/src/com/intellij/ide/projectView/actions/CreateLibraryFromFilesDialog.java
index a75eb5d5ce5a..0b35148283dc 100644
--- a/java/idea-ui/src/com/intellij/ide/projectView/actions/CreateLibraryFromFilesDialog.java
+++ b/java/idea-ui/src/com/intellij/ide/projectView/actions/CreateLibraryFromFilesDialog.java
@@ -26,7 +26,7 @@ import com.intellij.openapi.roots.ModuleRootModificationUtil;
 import com.intellij.openapi.roots.impl.libraries.LibraryTypeServiceImpl;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.roots.libraries.ui.OrderRoot;
-import com.intellij.openapi.roots.ui.configuration.ModulesCombobox;
+import com.intellij.application.options.ModulesComboBox;
 import com.intellij.openapi.roots.ui.configuration.libraryEditor.LibraryNameAndLevelPanel;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainer;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainerFactory;
@@ -50,7 +50,7 @@ import java.util.List;
  */
 public class CreateLibraryFromFilesDialog extends DialogWrapper {
   private final LibraryNameAndLevelPanel myNameAndLevelPanel;
-  private final ModulesCombobox myModulesCombobox;
+  private final ModulesComboBox myModulesComboBox;
   private final Project myProject;
   private final List<OrderRoot> myRoots;
   private final JPanel myPanel;
@@ -67,10 +67,10 @@ public class CreateLibraryFromFilesDialog extends DialogWrapper {
     myNameAndLevelPanel = new LibraryNameAndLevelPanel(builder, myDefaultName, Arrays.asList(LibrariesContainer.LibraryLevel.values()),
                                                        LibrariesContainer.LibraryLevel.PROJECT);
     myNameAndLevelPanel.setDefaultName(myDefaultName);
-    myModulesCombobox = new ModulesCombobox();
-    myModulesCombobox.fillModules(myProject);
-    myModulesCombobox.setSelectedModule(findModule(roots));
-    builder.addLabeledComponent("&Add to module:", myModulesCombobox);
+    myModulesComboBox = new ModulesComboBox();
+    myModulesComboBox.fillModules(myProject);
+    myModulesComboBox.setSelectedModule(findModule(roots));
+    builder.addLabeledComponent("&Add to module:", myModulesComboBox);
     myPanel = builder.getPanel();
     myNameAndLevelPanel.getLibraryNameField().selectAll();
     myNameAndLevelPanel.getLevelComboBox().addActionListener(new ActionListener() {
@@ -134,7 +134,7 @@ public class CreateLibraryFromFilesDialog extends DialogWrapper {
     final LibrariesContainer.LibraryLevel level = myNameAndLevelPanel.getLibraryLevel();
     AccessToken token = WriteAction.start();
     try {
-      final Module module = myModulesCombobox.getSelectedModule();
+      final Module module = myModulesComboBox.getSelectedModule();
       final String libraryName = myNameAndLevelPanel.getLibraryName();
       if (level == LibrariesContainer.LibraryLevel.MODULE) {
         final ModifiableRootModel modifiableModel = ModuleRootManager.getInstance(module).getModifiableModel();