From 28e27052cf8d07bc98fc5a127a03b53b76f3bb12 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Fri, 12 Aug 2016 12:42:14 +0300 Subject: [PATCH] [shelve]: fix dialog to be compatible with new MigLayout library * problem Introduced in a9e7965f88; --- .../vcs/changes/shelf/CleanUnshelvedFilterDialog.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CleanUnshelvedFilterDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CleanUnshelvedFilterDialog.java index d65a08d606a2..f0a007fb9a44 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CleanUnshelvedFilterDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CleanUnshelvedFilterDialog.java @@ -86,7 +86,8 @@ public class CleanUnshelvedFilterDialog extends DialogWrapper { protected JComponent createCenterPanel() { JPanel panel = new JPanel(new BorderLayout()); JLabel questLabel = new JLabel("Delete already unshelved changelists: \n"); - final MigLayout migLayout = new MigLayout("flowx, ins 0"); + String panelConstraints = "flowx, ins 0"; + final MigLayout migLayout = new MigLayout(panelConstraints); JPanel buttonsPanel = new JPanel(migLayout); ButtonGroup gr = new ButtonGroup(); gr.add(mySystemUnshelvedButton); @@ -97,9 +98,9 @@ public class CleanUnshelvedFilterDialog extends DialogWrapper { myUnshelvedWithFilterButton.setBorder(BorderFactory.createEmptyBorder()); myAllUnshelvedButton.setBorder(BorderFactory.createEmptyBorder()); - buttonsPanel.add(mySystemUnshelvedButton,"wrap"); + buttonsPanel.add(mySystemUnshelvedButton, "wrap"); - JPanel filterPanel = new JPanel(migLayout); + JPanel filterPanel = new JPanel(new MigLayout(panelConstraints)); filterPanel.add(myUnshelvedWithFilterButton); filterPanel.add(myTimePeriodComboBox); buttonsPanel.add(filterPanel, "wrap");