From 334f995903357900bda2e50c207caa6a62eb313e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 10 Oct 2012 13:13:50 +0200
Subject: [PATCH] Extra border dropped

---
 .../options/editor/EditorOptionsPanel.form       | 16 ++++------------
 .../src/messages/ApplicationBundle.properties    |  1 +
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.form b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.form
index aab91296ed1b..2e65d3a81e99 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.form
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsPanel.form
@@ -390,7 +390,7 @@
                       </component>
                     </children>
                   </grid>
-                  <grid id="70a4f" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                  <grid id="70a4f" 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="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"/>
@@ -401,14 +401,6 @@
                     </clientProperties>
                     <border type="none" title="Refactorings"/>
                     <children>
-                      <component id="12fd1" class="javax.swing.JCheckBox" binding="myPreselectCheckBox" default-binding="true">
-                        <constraints>
-                          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
-                        </constraints>
-                        <properties>
-                          <text value="Preselect old name"/>
-                        </properties>
-                      </component>
                       <component id="c0a29" class="javax.swing.JCheckBox" binding="myCbRenameLocalVariablesInplace">
                         <constraints>
                           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
@@ -417,12 +409,12 @@
                           <text resource-bundle="messages/ApplicationBundle" key="checkbox.rename.local.variables.inplace"/>
                         </properties>
                       </component>
-                      <component id="682c7" class="com.intellij.ui.TitledSeparator">
+                      <component id="12fd1" class="javax.swing.JCheckBox" binding="myPreselectCheckBox" default-binding="true">
                         <constraints>
-                          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                         </constraints>
                         <properties>
-                          <text value="Rename"/>
+                          <text resource-bundle="messages/ApplicationBundle" key="checkbox.rename.local.variables.preselect"/>
                         </properties>
                       </component>
                     </children>
diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
index fddc68f6453a..044966a4cbfe 100644
--- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties
+++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
@@ -88,6 +88,7 @@ title.dont.wrap.if.inline.content=Dont Wrap If Inline Content Only
 checkbox.wrap.text=Wrap text
 checkbox.parentheses.around.method.arguments=Add parentheses around method arguments
 checkbox.rename.local.variables.inplace=Enable in-place mode
+checkbox.rename.local.variables.preselect=Preselect old name
 editbox.keep.blank.lines=Keep blank lines:
 checkbox.keep.white.spaces=Keep white spaces
 checkbox.align.text=Align text