Move: Fix dialog layout (member selection panel should take as much space as possible)

#KT-7696 In Progress

idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.form

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog">
-  <grid id="1a398" binding="mainPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="1a398" binding="mainPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-    <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="10" y="10" width="472" height="414"/>
     </constraints>
@@ -10,100 +9,113 @@
       <color color="-8355712"/>
     </border>
     <children>
-      <component id="74471" class="com.intellij.ui.NonFocusableCheckBox" binding="cbSearchInComments">
+      <grid id="6433c" layout-manager="BorderLayout" hgap="0" vgap="0">
-        <constraints>
+        <constraints border-constraint="Center"/>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <selected value="true"/>
-          <text resource-bundle="messages/RefactoringBundle" key="search.in.comments.and.strings"/>
-        </properties>
-      </component>
-      <component id="a7936" class="com.intellij.ui.NonFocusableCheckBox" binding="cbSearchTextOccurences">
-        <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <selected value="true"/>
-          <text resource-bundle="messages/RefactoringBundle" key="search.for.text.occurrences"/>
-        </properties>
-      </component>
-      <grid id="ce694" binding="targetPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
         <properties/>
         <border type="none"/>
         <children>
-          <component id="4934c" class="javax.swing.JLabel" binding="targetDestinationLabel">
+          <grid id="c5589" binding="memberInfoPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-            <constraints>
+            <constraints border-constraint="Center"/>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <labelFor value="36327"/>
-              <text resource-bundle="messages/RefactoringBundle" key="target.destination.folder"/>
-            </properties>
-          </component>
-          <component id="36327" class="com.intellij.ui.ComboboxWithBrowseButton" binding="destinationFolderCB" custom-create="true">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
             <properties/>
-          </component>
+            <border type="none"/>
+            <children/>
+          </grid>
+          <grid id="f5f5" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints border-constraint="South"/>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="fced3" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                <margin top="7" left="0" bottom="7" right="0"/>
+                <constraints>
+                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+                <border type="none"/>
+                <children>
+                  <component id="37672" class="com.intellij.ui.ReferenceEditorComboWithBrowseButton" binding="classPackageChooser" custom-create="true">
+                    <constraints>
+                      <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties/>
+                  </component>
+                  <component id="765d3" class="javax.swing.JRadioButton" binding="rbMoveToPackage">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="To package:"/>
+                    </properties>
+                  </component>
+                  <component id="9ea97" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="fileChooser">
+                    <constraints>
+                      <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties/>
+                  </component>
+                  <component id="58e61" class="javax.swing.JRadioButton" binding="rbMoveToFile">
+                    <constraints>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="To file:"/>
+                    </properties>
+                  </component>
+                  <grid id="ce694" binding="targetPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                    <margin top="0" left="0" bottom="0" right="0"/>
+                    <constraints>
+                      <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties/>
+                    <border type="none"/>
+                    <children>
+                      <component id="4934c" class="javax.swing.JLabel">
+                        <constraints>
+                          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties>
+                          <labelFor value="36327"/>
+                          <text resource-bundle="messages/RefactoringBundle" key="target.destination.folder"/>
+                        </properties>
+                      </component>
+                      <component id="36327" class="com.intellij.ui.ComboboxWithBrowseButton" binding="destinationFolderCB" custom-create="true">
+                        <constraints>
+                          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                        </constraints>
+                        <properties/>
+                      </component>
+                    </children>
+                  </grid>
+                  <component id="74471" class="com.intellij.ui.NonFocusableCheckBox" binding="cbSearchInComments">
+                    <constraints>
+                      <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="3" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <selected value="true"/>
+                      <text resource-bundle="messages/RefactoringBundle" key="search.in.comments.and.strings"/>
+                    </properties>
+                  </component>
+                  <component id="a7936" class="com.intellij.ui.NonFocusableCheckBox" binding="cbSearchTextOccurrences">
+                    <constraints>
+                      <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="3" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <selected value="true"/>
+                      <text resource-bundle="messages/RefactoringBundle" key="search.for.text.occurrences"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
+              <vspacer id="9c908">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                </constraints>
+              </vspacer>
+            </children>
+          </grid>
         </children>
       </grid>
-      <vspacer id="fdc31">
-        <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
-        </constraints>
-      </vspacer>
-      <grid id="fced3" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="7" left="0" bottom="7" right="0"/>
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="37672" class="com.intellij.ui.ReferenceEditorComboWithBrowseButton" binding="classPackageChooser" custom-create="true">
-            <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties/>
-          </component>
-          <component id="765d3" class="javax.swing.JRadioButton" binding="rbMoveToPackage">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="To package:"/>
-            </properties>
-          </component>
-          <component id="9ea97" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="fileChooser">
-            <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties/>
-          </component>
-          <component id="58e61" class="javax.swing.JRadioButton" binding="rbMoveToFile">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="To file:"/>
-            </properties>
-          </component>
-        </children>
-      </grid>
-      <grid id="c5589" binding="memberInfoPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children/>
-      </grid>
     </children>
   </grid>
   <buttonGroups>

idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java

@@ -92,12 +92,11 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
     }
 
     private JCheckBox cbSearchInComments;
-    private JCheckBox cbSearchTextOccurences;
+    private JCheckBox cbSearchTextOccurrences;
     private JPanel mainPanel;
     private ReferenceEditorComboWithBrowseButton classPackageChooser;
     private ComboboxWithBrowseButton destinationFolderCB;
     private JPanel targetPanel;
-    private JLabel targetDestinationLabel;
     private JRadioButton rbMoveToPackage;
     private JRadioButton rbMoveToFile;
     private TextFieldWithBrowseButton fileChooser;
@@ -184,7 +183,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
 
     private void initSearchOptions(boolean searchInComments, boolean searchForTextOccurences) {
         cbSearchInComments.setSelected(searchInComments);
-        cbSearchTextOccurences.setSelected(searchForTextOccurences);
+        cbSearchTextOccurrences.setSelected(searchForTextOccurences);
     }
 
     private void initMoveToButtons(boolean moveToPackage) {
@@ -365,20 +364,12 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
 
     @Override
     protected JComponent createCenterPanel() {
-        boolean isDestinationVisible = hasAnySourceRoots();
-        destinationFolderCB.setVisible(isDestinationVisible);
-        targetDestinationLabel.setVisible(isDestinationVisible);
-        return null;
-    }
-
-    @Override
-    protected JComponent createNorthPanel() {
         return mainPanel;
     }
 
     @Override
     protected String getDimensionServiceKey() {
-        return "#com.intellij.refactoring.move.moveClassesOrPackages.MoveKotlinTopLevelDeclarationsDialog.classes";
+        return "#" + getClass().getName();
     }
 
     protected final String getTargetPackage() {
@@ -426,7 +417,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
     }
 
     private boolean isSearchInNonJavaFiles() {
-        return cbSearchTextOccurences.isSelected();
+        return cbSearchTextOccurrences.isSelected();
     }
 
     private boolean isSearchInComments() {