diff --git a/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java b/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java index 707e1b332148..28bce2dac381 100644 --- a/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java +++ b/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java @@ -23,7 +23,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.ui.components.ExpandableTextField; +import com.intellij.ui.components.fields.ExpandableTextField; import com.intellij.util.Function; import com.intellij.util.execution.ParametersListUtil; import org.jetbrains.annotations.Nullable; diff --git a/platform/platform-api/src/com/intellij/ui/components/ExpandableTextField.java b/platform/platform-api/src/com/intellij/ui/components/fields/ExpandableTextField.java similarity index 98% rename from platform/platform-api/src/com/intellij/ui/components/ExpandableTextField.java rename to platform/platform-api/src/com/intellij/ui/components/fields/ExpandableTextField.java index ec4edd94fd91..5eff72b5f15c 100644 --- a/platform/platform-api/src/com/intellij/ui/components/ExpandableTextField.java +++ b/platform/platform-api/src/com/intellij/ui/components/fields/ExpandableTextField.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ui.components; +package com.intellij.ui.components.fields; import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.popup.JBPopup; @@ -23,6 +23,8 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.Expandable; import com.intellij.ui.ScreenUtil; import com.intellij.ui.awt.RelativePoint; +import com.intellij.ui.components.JBScrollBar; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Function; import com.intellij.util.execution.ParametersListUtil; import com.intellij.util.ui.JBInsets; diff --git a/platform/platform-api/src/com/intellij/ui/components/ExtendableTextField.java b/platform/platform-api/src/com/intellij/ui/components/fields/ExtendableTextField.java similarity index 97% rename from platform/platform-api/src/com/intellij/ui/components/ExtendableTextField.java rename to platform/platform-api/src/com/intellij/ui/components/fields/ExtendableTextField.java index 57bd8c531402..8c5a3fdb73b0 100644 --- a/platform/platform-api/src/com/intellij/ui/components/ExtendableTextField.java +++ b/platform/platform-api/src/com/intellij/ui/components/fields/ExtendableTextField.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ui.components; +package com.intellij.ui.components.fields; + +import com.intellij.ui.components.JBTextField; import javax.swing.Icon; import javax.swing.JComponent; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java index 02fdd423a4ca..c68fc87b78ee 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java @@ -23,8 +23,8 @@ import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.registry.Registry; import com.intellij.ui.SearchTextField; -import com.intellij.ui.components.ExtendableTextField; -import com.intellij.ui.components.ExtendableTextField.Extension; +import com.intellij.ui.components.fields.ExtendableTextField; +import com.intellij.ui.components.fields.ExtendableTextField.Extension; import com.intellij.util.ui.JBInsets; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; diff --git a/platform/platform-impl/src/com/intellij/ui/components/TestTextFieldAction.java b/platform/platform-impl/src/com/intellij/ui/components/TestTextFieldAction.java index 15f892e27a87..3416690be089 100644 --- a/platform/platform-impl/src/com/intellij/ui/components/TestTextFieldAction.java +++ b/platform/platform-impl/src/com/intellij/ui/components/TestTextFieldAction.java @@ -21,6 +21,8 @@ import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.ui.ComboBox; import com.intellij.ui.JBColor; import com.intellij.ui.SearchTextField; +import com.intellij.ui.components.fields.ExpandableTextField; +import com.intellij.ui.components.fields.ExtendableTextField; import com.intellij.ui.components.panels.HorizontalLayout; import javax.swing.*; diff --git a/plugins/git4idea/src/git4idea/config/GitVcsPanel.java b/plugins/git4idea/src/git4idea/config/GitVcsPanel.java index f0cb2b50dc97..632ecac4cc8d 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsPanel.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsPanel.java @@ -29,7 +29,7 @@ import com.intellij.openapi.util.ThrowableComputable; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.EnumComboBoxModel; import com.intellij.ui.ListCellRendererWrapper; -import com.intellij.ui.components.ExpandableTextField; +import com.intellij.ui.components.fields.ExpandableTextField; import com.intellij.ui.components.JBCheckBox; import com.intellij.ui.components.JBLabel; import com.intellij.util.containers.ContainerUtil; diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java index 07a7de2ec8ea..39210a5fc491 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java +++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java @@ -27,7 +27,6 @@ import com.intellij.execution.junit.TestClassFilter; import com.intellij.execution.testframework.SourceScope; import com.intellij.execution.testframework.TestSearchScope; import com.intellij.execution.ui.*; -import com.intellij.icons.AllIcons; import com.intellij.ide.util.ClassFilter; import com.intellij.ide.util.PackageChooserDialog; import com.intellij.openapi.fileChooser.FileChooser; @@ -50,7 +49,7 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.rt.execution.junit.RepeatCount; import com.intellij.ui.*; -import com.intellij.ui.components.ExpandableTextField; +import com.intellij.ui.components.fields.ExpandableTextField; import com.intellij.ui.components.JBLabel; import com.intellij.util.IconUtil; import com.intellij.util.ui.UIUtil; diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java index c4bf094132bb..699134bc1f39 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java @@ -26,7 +26,6 @@ import com.intellij.execution.ui.CommonJavaParametersPanel; import com.intellij.execution.ui.ConfigurationModuleSelector; import com.intellij.execution.ui.DefaultJreSelector; import com.intellij.execution.ui.JrePathEditor; -import com.intellij.icons.AllIcons; import com.intellij.ide.util.TreeClassChooser; import com.intellij.ide.util.TreeClassChooserFactory; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -44,7 +43,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.*; -import com.intellij.ui.components.ExpandableTextField; +import com.intellij.ui.components.fields.ExpandableTextField; import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBList; import com.intellij.ui.table.TableView;