diff --git a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringDialog.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringDialog.java index 081ca8ce3750..80c0178ab362 100644 --- a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringDialog.java @@ -74,6 +74,7 @@ public class InlineSuperClassRefactoringDialog extends InlineOptionsDialog { return "Inline_Super_Class"; } + @NotNull protected JComponent createCenterPanel() { final JLabel label = new JLabel("Super class \'" + mySuperClass.getQualifiedName() + @@ -85,6 +86,7 @@ public class InlineSuperClassRefactoringDialog extends InlineOptionsDialog { } }, "\',
   \'") + "\'"); + label.setVerticalAlignment(SwingConstants.TOP); final JPanel panel = new JPanel(new GridBagLayout()); final GridBagConstraints gc = new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, @@ -93,10 +95,11 @@ public class InlineSuperClassRefactoringDialog extends InlineOptionsDialog { JScrollPane pane = ScrollPaneFactory.createScrollPane(label); pane.setBorder(IdeBorderFactory.createEmptyBorder(5, 5, 5, 5)); pane.setMinimumSize(JBDimension.create(new Dimension(-1, 100))); - pane.setMaximumSize(JBDimension.create(new Dimension(-1, 400))); - panel.add(pane, gc); gc.weighty = 1; gc.fill = GridBagConstraints.BOTH; + panel.add(pane, gc); + gc.weighty = 0; + gc.fill = GridBagConstraints.HORIZONTAL; panel.add(super.createCenterPanel(), gc); return panel; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java index 064bc2dfe030..827808cf0f4c 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java @@ -24,6 +24,7 @@ import com.intellij.psi.search.PsiSearchHelper; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.RadioUpDownListener; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.border.EmptyBorder; @@ -53,6 +54,7 @@ public abstract class InlineOptionsDialog extends RefactoringDialog implements I return myRbInlineThisOnly.isSelected(); } + @NotNull @Override protected JComponent createCenterPanel() { JPanel optionsPanel = new JPanel(); diff --git a/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsWithSearchSettingsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsWithSearchSettingsDialog.java index 13477669ecd3..28db4c1927a7 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsWithSearchSettingsDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsWithSearchSettingsDialog.java @@ -19,6 +19,7 @@ package com.intellij.refactoring.inline; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringBundle; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -63,6 +64,7 @@ public abstract class InlineOptionsWithSearchSettingsDialog extends InlineOption } } + @NotNull @Override protected JComponent createCenterPanel() { final JPanel panel = new JPanel(new GridBagLayout());