From 7117fb8560fc50841b17b5366f17dfd5ad446f1e Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Wed, 11 Apr 2012 14:50:19 +0400
Subject: [PATCH] SVN: fix: integrate option dialog missed additional panel

---
 .../idea/svn/update/SvnIntegratePanel.form    | 73 +++++++++++--------
 .../idea/svn/update/SvnIntegratePanel.java    |  6 ++
 2 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.form
index 421e55dc9819..757acbf17742 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.form
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.svn.update.SvnIntegratePanel">
-  <grid id="3083f" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="3083f" binding="myPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="32" y="158" width="403" height="208"/>
@@ -8,14 +8,6 @@
     <properties/>
     <border type="none"/>
     <children>
-      <component id="625e3" class="javax.swing.JCheckBox" binding="myDryRunCheckbox">
-        <constraints>
-          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="checkbox.update.switch.configurable.try.merge.without.changes"/>
-        </properties>
-      </component>
       <xy id="ef0c1" binding="myRootOptionsPanel" layout-manager="XYLayout" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
@@ -25,29 +17,52 @@
         <border type="none"/>
         <children/>
       </xy>
-      <component id="68eaf" class="javax.swing.JCheckBox" binding="myUseAncestry">
+      <grid id="a85d8" binding="myAdditionalPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" 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="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="action.Subversion.integrate.difference.option.use.ancestry.text"/>
-        </properties>
-      </component>
-      <component id="31e75" class="org.jetbrains.idea.svn.DepthCombo" binding="myDepthCombo" custom-create="true">
-        <constraints>
-          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <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/>
-      </component>
-      <component id="61668" class="javax.swing.JLabel" binding="myDepthLabel">
-        <constraints>
-          <grid row="3" 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 resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="label.depth.text"/>
-          <toolTipText resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="label.depth.description"/>
-        </properties>
-      </component>
+        <border type="none"/>
+        <children>
+          <component id="68eaf" class="javax.swing.JCheckBox" binding="myUseAncestry">
+            <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"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="action.Subversion.integrate.difference.option.use.ancestry.text"/>
+            </properties>
+          </component>
+          <hspacer id="83f4a">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+          </hspacer>
+          <component id="625e3" class="javax.swing.JCheckBox" binding="myDryRunCheckbox">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="checkbox.update.switch.configurable.try.merge.without.changes"/>
+            </properties>
+          </component>
+          <component id="61668" class="javax.swing.JLabel" binding="myDepthLabel">
+            <constraints>
+              <grid row="2" 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 resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="label.depth.text"/>
+              <toolTipText resource-bundle="org/jetbrains/idea/svn/SvnBundle" key="label.depth.description"/>
+            </properties>
+          </component>
+          <component id="31e75" class="org.jetbrains.idea.svn.DepthCombo" binding="myDepthCombo" custom-create="true">
+            <constraints>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+          </component>
+        </children>
+      </grid>
     </children>
   </grid>
 </form>
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.java
index badc713b8de2..b01b3790e299 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.java
@@ -32,6 +32,7 @@ public class SvnIntegratePanel extends AbstractSvnUpdatePanel{
   private JCheckBox myUseAncestry;
   private DepthCombo myDepthCombo;
   private JLabel myDepthLabel;
+  private JPanel myAdditionalPanel;
 
   public SvnIntegratePanel(final SvnVcs vcs, Collection<FilePath> roots) {
     super(vcs);
@@ -57,6 +58,11 @@ public class SvnIntegratePanel extends AbstractSvnUpdatePanel{
     return myRootOptionsPanel;
   }
 
+  @Override
+  protected JPanel getAdditionalPanel() {
+    return myAdditionalPanel;
+  }
+
   public void reset(final SvnConfiguration configuration) {
     super.reset(configuration);
     myDryRunCheckbox.setSelected(configuration.MERGE_DRY_RUN);