MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix alignment of "include provided" in App run configuration IDEA-107048

Browse Source
This commit is contained in:
Nikita Skvortsov
2017-12-08 00:34:37 +03:00
parent 829788e410
commit f977dc66f4
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form
+3 -2
View File
@@ -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>
java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
+5 -4
View File
@@ -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);
}