From f977dc66f4f7d078d95168a9d6f8d5655e010c98 Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Thu, 7 Dec 2017 22:54:30 +0300
Subject: [PATCH] fix alignment of "include provided" in App run configuration
 IDEA-107048

---
 .../execution/application/ApplicationConfigurable.form   | 5 +++--
 .../execution/application/ApplicationConfigurable.java   | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form
index c7953d3c98de..49f56e63e70f 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form
@@ -72,12 +72,13 @@
           <text resource-bundle="messages/ExecutionBundle" key="application.configuration.shorten.command.line.label"/>
         </properties>
       </component>
-      <component id="241cb" class="com.intellij.ui.components.JBCheckBox" binding="myIncludeProvidedDeps">
+      <component id="241cb" class="com.intellij.openapi.ui.LabeledComponent" binding="myIncludeProvidedDeps">
         <constraints>
           <grid row="4" 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="messages/ExecutionBundle" key="application.configuration.include.provided.scope"/>
+          <labelLocation value="West"/>
+          <text value=""/>
         </properties>
       </component>
     </children>
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
index e5cf26e47ed8..8249862a614d 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
@@ -51,7 +51,7 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
   private final ConfigurationModuleSelector myModuleSelector;
   private JrePathEditor myJrePathEditor;
   private JCheckBox myShowSwingInspectorCheckbox;
-  private JBCheckBox myIncludeProvidedDeps;
+  private LabeledComponent<JBCheckBox> myIncludeProvidedDeps;
   private final JreVersionDetector myVersionDetector;
   private final Project myProject;
   private JComponent myAnchor;
@@ -70,8 +70,9 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
     myVersionDetector = new JreVersionDetector();
 
     myShortenClasspathModeCombo.setComponent(new ShortenCommandLineModeCombo(myProject, myJrePathEditor, myModule.getComponent()));
+    myIncludeProvidedDeps.setComponent(new JBCheckBox(ExecutionBundle.message("application.configuration.include.provided.scope")));
     myAnchor = UIUtil.mergeComponentsWithAnchor(myMainClass, myCommonProgramParameters, myJrePathEditor, myModule,
-                                                myShortenClasspathModeCombo);
+                                                myShortenClasspathModeCombo, myIncludeProvidedDeps);
   }
 
   public void applyEditorTo(@NotNull final ApplicationConfiguration configuration) throws ConfigurationException {
@@ -84,7 +85,7 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
     configuration.ALTERNATIVE_JRE_PATH_ENABLED = myJrePathEditor.isAlternativeJreSelected();
     configuration.ENABLE_SWING_INSPECTOR = (myVersionDetector.isJre50Configured(configuration) || myVersionDetector.isModuleJre50Configured(configuration)) && myShowSwingInspectorCheckbox.isSelected();
     configuration.setShortenCommandLine((ShortenCommandLine)myShortenClasspathModeCombo.getComponent().getSelectedItem());
-    configuration.setIncludeProvidedScope(myIncludeProvidedDeps.isSelected());
+    configuration.setIncludeProvidedScope(myIncludeProvidedDeps.getComponent().isSelected());
 
     updateShowSwingInspector(configuration);
   }
@@ -95,7 +96,7 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
     getMainClassField().setText(configuration.MAIN_CLASS_NAME != null ? configuration.MAIN_CLASS_NAME.replaceAll("\\$", "\\.") : "");
     myJrePathEditor.setPathOrName(configuration.ALTERNATIVE_JRE_PATH, configuration.ALTERNATIVE_JRE_PATH_ENABLED);
     myShortenClasspathModeCombo.getComponent().setSelectedItem(configuration.getShortenCommandLine());
-    myIncludeProvidedDeps.setSelected(configuration.isProvidedScopeIncluded());
+    myIncludeProvidedDeps.getComponent().setSelected(configuration.isProvidedScopeIncluded());
 
     updateShowSwingInspector(configuration);
   }