From 3601adbd11a8e7d0285a336e9e519c73e708fd4b Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Fri, 6 Jul 2012 17:27:12 +0200
Subject: [PATCH] move: do not select "leave in same source root" when exactly
 one root contains package (IDEA-87693)

---
 .../moveClassesOrPackages/DestinationFolderComboBox.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java
index c9a3abdaaaf9..007e40f9d84d 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.refactoring.move.moveClassesOrPackages;
 
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ide.util.DirectoryChooser;
 import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
@@ -32,10 +31,7 @@ import com.intellij.psi.PsiManager;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.refactoring.MoveDestination;
 import com.intellij.refactoring.PackageWrapper;
-import com.intellij.ui.CollectionComboBoxModel;
-import com.intellij.ui.ComboboxSpeedSearch;
-import com.intellij.ui.ComboboxWithBrowseButton;
-import com.intellij.ui.EditorComboBox;
+import com.intellij.ui.*;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -260,7 +256,7 @@ public abstract class DestinationFolderComboBox extends ComboboxWithBrowseButton
                                                               final ArrayList<DirectoryChooser.ItemWrapper> items,
                                                               final DirectoryChooser.ItemWrapper initial,
                                                               final DirectoryChooser.ItemWrapper oldOne) {
-    if (initial != null || items.contains(NULL_WRAPPER) || items.isEmpty()) {
+    if (initial != null || (items.size() > 2 && items.contains(NULL_WRAPPER)) || items.isEmpty()) {
       return initial;
     }
     else {