diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.form b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.form index 80745c55baab..6b637bec6b7c 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.form +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.form @@ -38,19 +38,6 @@ - - - - - - - - - - - - - @@ -92,6 +79,19 @@ + + + + + + + + + + + + + diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java index 0e29d5520da8..c5d6bde48e4c 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java @@ -101,6 +101,7 @@ public class DownloadingOptionsDialog extends DialogWrapper { } }); + myFilesList.setBorder(null); myFilesToDownloadLabel.setLabelFor(myFilesList); myDirectoryField.addBrowseFolderListener(ProjectBundle.message("file.chooser.directory.for.downloaded.libraries.title"), ProjectBundle.message("file.chooser.directory.for.downloaded.libraries.description"), null, diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.form b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.form index 1513d298bdba..afaac4ee2c18 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.form +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.form @@ -3,7 +3,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -104,21 +104,16 @@ - + - - - - - - + @@ -131,12 +126,14 @@ - + + + @@ -150,6 +147,11 @@ + + + + + diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java index ae24d651141b..9fc4c0f4c5ad 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java @@ -46,6 +46,7 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.HtmlListCellRenderer; import com.intellij.ui.SortedComboBoxModel; +import com.intellij.ui.components.JBLabel; import com.intellij.util.PathUtil; import com.intellij.util.PlatformIcons; import com.intellij.util.download.DownloadableFileSetVersions; @@ -70,7 +71,7 @@ import java.util.List; public class LibraryOptionsPanel implements Disposable { private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ui.libraries.LibraryOptionsPanel"); - private JLabel myMessageLabel; + private JBLabel myMessageLabel; private JPanel myPanel; private JButton myConfigureButton; private JComboBox myExistingLibraryComboBox; @@ -218,7 +219,6 @@ public class LibraryOptionsPanel implements Disposable { } final Dimension minimumSize = new Dimension(-1, myMessageLabel.getFontMetrics(myMessageLabel.getFont()).getHeight() * 2); - myMessageLabel.setMinimumSize(minimumSize); myHiddenLabel.setMinimumSize(minimumSize); myCreateButton.addActionListener(new ActionListener() { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryRootsComponentForm.form b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryRootsComponentForm.form index 8a0134a005eb..d6a4003268a2 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryRootsComponentForm.form +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LibraryRootsComponentForm.form @@ -1,6 +1,6 @@
- + diff --git a/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.java b/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.java index 97094ce67f4e..edfa1568db42 100644 --- a/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.java +++ b/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.java @@ -125,4 +125,8 @@ public abstract class OptionalChooserComponent implements CheckBoxListListene myListModel.addElement(createCheckBox(pair.first, pair.second)); } } + + public CheckBoxList getList() { + return myList; + } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form index 4ea26c5ab04e..6c2dcc6647ad 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@ - + @@ -34,25 +34,42 @@ - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java index 3e5b419b02d2..04d5990f0d19 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java @@ -27,6 +27,7 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.EditorTextField; import com.intellij.ui.PanelWithAnchor; +import com.intellij.ui.components.JBLabel; import com.intellij.util.TextFieldCompletionProvider; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -48,6 +49,7 @@ public abstract class MavenRunnerParametersConfigurable implements Configurable, protected LabeledComponent workingDirComponent; protected LabeledComponent goalsComponent; private LabeledComponent profilesComponent; + private JBLabel myFakeLabel; private JComponent anchor; public MavenRunnerParametersConfigurable(@NotNull Project project) { @@ -211,6 +213,7 @@ public abstract class MavenRunnerParametersConfigurable implements Configurable, workingDirComponent.setAnchor(anchor); goalsComponent.setAnchor(anchor); profilesComponent.setAnchor(anchor); + myFakeLabel.setAnchor(anchor); } private abstract class MyCompletionProvider extends TextFieldCompletionProvider {