From d98fe01f6a6f1e4ba6220bf8013ad40b1fa71b7f Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Tue, 29 Jun 2010 22:24:42 +0400 Subject: [PATCH] Some unnecessary JScrollPane -> JBScrollPane conversions have been done, unrolling. --- .../images/editor/impl/ImageEditorUI.java | 4 +- .../thumbnail/impl/ThumbnailViewUI.java | 7 ++-- .../actions/GenerateAntBuildDialog.java | 4 +- .../AnnotationProcessorsConfigurable.java | 4 +- .../options/ProcessedModulesTable.java | 3 +- .../CompoundRendererConfigurable.java | 4 +- .../intellij/debugger/ui/ExportDialog.java | 4 +- .../com/intellij/debugger/ui/FramesPanel.java | 4 +- .../debugger/ui/impl/DebuggerTreeBase.java | 4 +- .../debugger/ui/impl/InspectPanel.java | 4 +- .../debugger/ui/impl/ThreadsPanel.java | 4 +- .../debugger/ui/impl/VariablesPanel.java | 4 +- .../intellij/debugger/ui/impl/WatchPanel.java | 4 +- .../ide/palette/impl/PaletteWindow.java | 12 +++--- .../importProject/ProjectLayoutPanel.java | 12 +++--- .../util/projectWizard/JdkChooserPanel.java | 4 +- .../util/projectWizard/ModuleTypeStep.java | 5 +-- .../openapi/projectRoots/ui/PathEditor.java | 3 +- .../roots/ui/configuration/SidePanel.java | 4 +- .../DetectedSourceRootsDialog.java | 12 ++---- .../CodeStyleGenerationConfigurable.java | 3 +- .../RestoreReferencesDialog.java | 4 +- .../util/SpecialAnnotationsUtil.java | 3 +- .../ide/util/PackageChooserDialog.java | 4 +- .../ide/util/TreeClassChooserDialog.java | 4 +- .../ChangeClassSignatureDialog.java | 3 +- .../ChangeSignatureDialog.java | 5 +-- .../inCallers/CallerChooser.java | 8 +--- .../EncapsulateFieldsDialog.java | 3 +- .../EnclosingMethodSelectionDialog.java | 4 +- .../migration/EditMigrationDialog.java | 3 +- .../migration/MigrationDialog.java | 6 +-- .../MoveInstanceMethodDialog.java | 3 +- .../MoveInstanceMethodDialogBase.java | 3 +- .../move/moveMembers/MoveMembersDialog.java | 3 +- .../ReplaceConstructorWithBuilderDialog.java | 3 +- .../safeDelete/OverridingMethodsDialog.java | 3 +- .../TurnRefsToSuperDialog.java | 4 +- .../ui/FailedConversionsDialog.java | 4 +- .../refactoring/ui/MemberSelectionPanel.java | 3 +- .../refactoring/util/ParameterTablePanel.java | 3 +- .../createTest/CreateTestDialog.java | 3 +- .../intellij/unscramble/ThreadDumpPanel.java | 8 +--- .../fieldTest/after/ComponentCaller.java | 4 +- .../fieldTest/before/ComponentCaller.java | 4 +- .../ui/classFilter/ClassFilterEditor.java | 3 +- .../codeStyle/OptionTreeWithPreviewPanel.java | 4 +- .../options/colors/OptionsPanelImpl.java | 4 +- .../documentation/DocumentationComponent.java | 6 +-- .../InspectionDescriptionLinkHandler.java | 3 +- .../impl/config/IntentionSettingsTree.java | 8 +--- .../codeInsight/lookup/impl/LookupImpl.java | 4 +- .../template/impl/TemplateListPanel.java | 3 +- .../ex/SeverityEditorDialog.java | 4 +- .../intellij/codeInspection/ui/Browser.java | 4 +- .../logging/LogConfigurationPanel.java | 3 +- .../impl/BaseExecuteBeforeRunDialog.java | 4 +- .../DefaultConfigurationSettingsEditor.java | 3 +- .../execution/impl/RunConfigurable.java | 3 +- .../impl/SingleConfigurationConfigurable.java | 3 +- .../intellij/find/impl/RegExHelpPopup.java | 6 +-- .../ide/commander/CommanderPanel.java | 8 +--- .../FavoritesTreeViewPanel.java | 3 +- .../impl/AllFileTemplatesConfigurable.java | 4 +- .../impl/FileTemplateConfigurable.java | 4 +- .../ui/CreateFromTemplatePanel.java | 4 +- .../ide/hierarchy/HierarchyBrowserBaseEx.java | 4 +- .../com/intellij/ide/macro/MacrosDialog.java | 6 +-- .../NavBarRootPaneExtension.java | 4 +- .../impl/AbstractProjectViewPSIPane.java | 6 +-- .../ide/scopeView/ScopeTreeViewPanel.java | 4 +- .../StructureViewComponent.java | 4 +- .../src/com/intellij/ide/todo/TodoPanel.java | 4 +- .../ide/todo/configurable/FilterDialog.java | 3 +- .../todo/configurable/TodoConfigurable.java | 5 +-- .../intellij/ide/util/DirectoryChooser.java | 4 +- .../com/intellij/ide/util/MemberChooser.java | 4 +- .../ide/util/TreeFileChooserDialog.java | 4 +- .../ide/util/gotoByName/ChooseByNameBase.java | 6 +-- .../internal/psiView/PsiViewerDialog.java | 6 +-- .../CommonContentEntriesEditor.java | 3 +- .../configuration/ContentEntryTreeEditor.java | 3 +- .../openapi/util/registry/RegistryUi.java | 6 +-- .../encoding/FileEncodingConfigurable.java | 3 +- .../ui/DependenciesPanel.java | 3 +- .../ui/SingleInspectionProfilePanel.java | 3 +- .../AbstractParameterTablePanel.java | 3 +- .../safeDelete/UnsafeUsagesDialog.java | 4 +- .../refactoring/ui/ConflictsDialog.java | 4 +- .../intellij/tools/OutputFiltersDialog.java | 3 +- .../src/com/intellij/tools/ToolsPanel.java | 3 +- .../debugger/extensions/DisposerDebugger.java | 6 +-- .../ui/debugger/extensions/FocusDebugger.java | 6 +-- .../debugger/extensions/PlaybackDebugger.java | 6 +-- .../ui/classpath/SimpleClasspathPanel.java | 3 +- .../ui/tree/LanguagePerFileConfigurable.java | 3 +- .../integration/ui/views/HistoryDialog.java | 3 +- .../execution/util/ExecutionErrorDialog.java | 4 +- .../editor/actions/ContentChooser.java | 6 +-- .../openapi/ui/MasterDetailsComponent.java | 5 +-- .../src/com/intellij/openapi/ui/Messages.java | 5 +-- .../com/intellij/openapi/ui/StripeTable.java | 4 +- .../openapi/ui/popup/PopupChooserBuilder.java | 7 ++-- .../com/intellij/ui/AbstractFieldPanel.java | 3 +- .../com/intellij/ui/ScrollPaneFactory.java | 13 +++++- .../ui/speedSearch/ListWithFilter.java | 6 +-- .../com/intellij/ui/tabs/impl/JBTabsTest.java | 4 +- .../application/options/SelectFontDialog.java | 4 +- .../pathMacros/PathMacroListEditor.java | 3 +- .../codeInsight/hint/LineTooltipRenderer.java | 3 +- .../intellij/diagnostic/IdeErrorsDialog.java | 4 +- .../ui/AdaptiveTipDialog.java | 4 +- .../ui/ProgressTipPanel.java | 3 +- .../errorTreeView/NewErrorTreeViewPanel.java | 3 +- .../custom/impl/CustomFileTypeEditor.java | 8 +--- .../ide/plugins/PluginManagerMain.java | 5 +-- .../intellij/ide/util/ElementsChooser.java | 3 +- .../intellij/ide/util/ExportToFileUtil.java | 6 +-- .../src/com/intellij/ide/util/TipPanel.java | 4 +- .../impl/ui/NotificationsListPanel.java | 4 +- .../intellij/openapi/editor/ex/EditorEx.java | 1 + .../openapi/editor/impl/EditorImpl.java | 4 +- .../editor/impl/LeftHandScrollbarLayout.java | 42 +++++++++---------- .../editor/impl/ScrollingModelImpl.java | 3 +- .../fileChooser/ex/FileChooserDialogImpl.java | 4 +- .../openapi/keymap/impl/ui/ActionsTree.java | 3 +- .../impl/ui/KeyboardShortcutDialog.java | 4 +- .../openapi/keymap/impl/ui/KeymapPanel.java | 3 +- .../keymap/impl/ui/MouseShortcutDialog.java | 4 +- .../keymap/impl/ui/QuickListsPanel.java | 3 +- .../ex/ControlPanelSettingsEditor.java | 3 +- .../options/ex/ExplorerSettingsEditor.java | 5 +-- .../options/newEditor/OptionsEditor.java | 4 +- .../options/newEditor/OptionsTree.java | 8 +--- .../project/impl/DefineMacrosDialog.java | 4 +- .../openapi/wm/impl/status/ProcessPopup.java | 2 +- .../wm/impl/welcomeScreen/WelcomeScreen.java | 7 ++-- .../platform/FilesystemToolwindow.java | 4 +- .../ui/MultilineTreeCellRenderer.java | 2 +- .../com/intellij/ui/plaf/beg/BegBorders.java | 4 +- .../com/intellij/ui/popup/WizardPopup.java | 6 +-- .../testframework/ui/TestResultsPanel.java | 9 ++-- .../openapi/vcs/ui/CommitMessage.java | 4 +- .../CompareWithSelectedRevisionAction.java | 6 +-- .../vcs/changes/ChangesViewManager.java | 4 +- .../vcs/changes/UnversionedViewDialog.java | 4 +- .../committed/ChangeListDetailsAction.java | 4 +- .../committed/ColumnFilteringStrategy.java | 3 +- .../committed/CommittedChangesBrowser.java | 10 ++--- .../CommittedChangesTreeBrowser.java | 8 +--- .../committed/StructureFilteringStrategy.java | 4 +- .../vcs/changes/committed/WiseSplitter.java | 3 +- .../shelf/ShelvedChangesViewManager.java | 8 +--- .../changes/ui/ChangeListViewerDialog.java | 6 +-- .../vcs/changes/ui/ChangesListView.java | 3 +- .../vcs/changes/ui/ChangesTreeList.java | 9 ++-- .../changes/ui/CommitChangeListDialog.java | 6 +-- .../configurable/VcsConfigurationsDialog.java | 3 +- .../VcsDirectoryConfigurationPanel.java | 3 +- .../vcs/history/FileHistoryPanelImpl.java | 3 +- .../xdebugger/impl/ui/DebuggerUIUtil.java | 3 +- ...odNameMustStartWithQuestionInspection.java | 4 +- ...NameMayNotStartWithQuestionInspection.java | 4 +- .../ig/resources/IOResourceInspection.java | 4 +- .../ig/telemetry/TelemetryDisplayImpl.java | 4 +- .../lang/ant/config/execution/TreeView.java | 3 +- .../lang/ant/config/explorer/AntExplorer.java | 8 +--- .../config/explorer/SaveMetaTargetDialog.java | 4 +- .../copyright/ui/ProjectSettingsPanel.java | 4 +- .../config/ui/SelectCvsConfgurationPanel.java | 3 +- .../cvsSupport2/cvsBrowser/CvsTree.java | 4 +- .../devkit/src/util/ChooseModulesDialog.java | 4 +- .../git4idea/history/browser/GitLogTree.java | 11 ++--- .../browser/GitLogTreeFileSelector.java | 4 +- .../dynamic/DynamicToolWindowWrapper.java | 5 +-- .../groovy/doc/GroovyDocGenerationPanel.java | 3 +- .../groovy/gradle/ui/GradleSetupPanel.java | 4 +- .../extractMethod/ParameterTablePanel.java | 3 +- .../zmlx/hg4idea/ui/HgGlobalStatusDialog.java | 4 +- .../indices/MavenArtifactSearchPanel.java | 4 +- .../MavenProjectsNavigatorPanel.java | 4 +- .../SelectFromMavenProjectsDialog.java | 4 +- .../idea/maven/utils/ChooserDialog.java | 4 +- .../maven/wizards/MavenModuleWizardStep.java | 12 ++---- .../idea/svn/dialogs/CopiesPanel.java | 4 +- .../idea/svn/dialogs/LockDialog.java | 6 +-- .../svn/dialogs/PagedListWithActions.java | 6 ++- .../idea/svn/dialogs/PropertiesComponent.java | 6 +-- .../dialogs/RepositoryBrowserComponent.java | 6 +-- .../idea/svn/dialogs/SelectFilesDialog.java | 4 +- .../idea/svn/dialogs/ServerSSLDialog.java | 4 +- .../dialogs/browser/DeleteOptionsDialog.java | 4 +- .../dialogs/browser/ImportOptionsDialog.java | 4 +- .../idea/svn/history/RootsAndBranches.java | 6 +-- .../uiDesigner/actions/SurroundAction.java | 3 +- .../actions/SurroundActionGroup.java | 3 +- .../uiDesigner/designSurface/GuiEditor.java | 4 +- .../InsertComponentProcessor.java | 3 +- .../inspections/NoScrollPaneInspection.java | 5 +-- .../propertyInspector/PropertyInspector.java | 5 +-- .../UIDesignerToolWindowManager.java | 5 ++- .../editors/ColorEditor.java | 4 +- .../snapShooter/CreateSnapShotAction.java | 3 +- .../snapShooter/SnapShooterDaemon.java | 5 +-- .../wizard/BindToExistingBeanStep.java | 3 +- .../uiDesigner/wizard/BindToNewBeanStep.java | 3 +- .../src/gui-designer-properties.xml | 2 +- .../testData/ChainedConstructorTest.java | 4 +- .../testData/TestChainedConstructor.form | 2 +- .../testData/TestConditionalMethodCall.form | 2 +- .../ui-designer/testData/TestScrollPane.form | 2 +- .../uiDesigner/core/AsmCodeGeneratorTest.java | 5 +-- .../xpathView/ui/EditContextDialog.java | 6 +-- resources/src/idea/Palette2.xml | 2 +- .../application/options/TagListDialog.java | 4 +- 215 files changed, 435 insertions(+), 553 deletions(-) diff --git a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java index bdb447c8850c..c4f80c1742cf 100644 --- a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java +++ b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java @@ -24,7 +24,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import org.intellij.images.ImagesBundle; import org.intellij.images.editor.ImageDocument; import org.intellij.images.editor.ImageEditor; @@ -98,7 +98,7 @@ final class ImageEditorUI extends JPanel implements DataProvider { view.addMouseListener(new EditorMouseAdapter()); view.addMouseListener(new FocusRequester()); - JBScrollPane scrollPane = new JBScrollPane(view); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(view); scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java index 205c064c1611..dfc69947a51b 100644 --- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java +++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java @@ -32,8 +32,8 @@ import com.intellij.pom.Navigatable; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import org.intellij.images.fileTypes.ImageFileTypeManager; import org.intellij.images.options.*; import org.intellij.images.thumbnail.ThumbnailView; @@ -136,9 +136,8 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable { list.setFixedCellHeight(preferredSize.height); - JBScrollPane scrollPane = new JBScrollPane( - list, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER - ); + JScrollPane scrollPane = + ScrollPaneFactory.createScrollPane(list, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); ActionManager actionManager = ActionManager.getInstance(); ActionGroup actionGroup = (ActionGroup) actionManager.getAction(ThumbnailViewActions.GROUP_TOOLBAR); diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java index 3f6e8b386164..c121779066ba 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java @@ -27,7 +27,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.MultiLineLabelUI; import com.intellij.openapi.util.Pair; import com.intellij.ui.IdeBorderFactory; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ArrayUtil; import com.intellij.util.Chunk; import com.intellij.util.ListWithSelection; @@ -177,7 +177,7 @@ public class GenerateAntBuildDialog extends DialogWrapper { final Dimension preferredSize = new Dimension(myTable.getPreferredSize()); preferredSize.height = (myTableModel.getRowCount() + 2) * myTable.getRowHeight() + myTable.getTableHeader().getHeight(); - final JBScrollPane scrollPane = new JBScrollPane(myTable); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); scrollPane.setPreferredSize(preferredSize); myChunksPanel.add(scrollPane, BorderLayout.CENTER); } diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java index 443d462d9375..3e39d0280ef0 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java @@ -13,8 +13,8 @@ import com.intellij.openapi.ui.ex.MultiLineLabel; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TableUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.containers.HashMap; import com.intellij.util.ui.ItemRemovable; import com.intellij.util.ui.Table; @@ -109,7 +109,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable myProcessorsModel = new ProcessorTableModel(); processorTablePanel.setBorder(new TitledBorder("Annotation Processors")); myProcessorTable = new Table(myProcessorsModel); - processorTablePanel.add(new JBScrollPane(myProcessorTable), BorderLayout.CENTER); + processorTablePanel.add(ScrollPaneFactory.createScrollPane(myProcessorTable), BorderLayout.CENTER); final JPanel buttons = new JPanel(new GridBagLayout()); myAddButton = new JButton("Add"); buttons.add(myAddButton, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 0), 0, 0)); diff --git a/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java b/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java index 83182fe90548..7a7c97e71e48 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java @@ -24,7 +24,6 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SpeedSearchBase; import com.intellij.ui.TableUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.ItemRemovable; import com.intellij.util.ui.Table; import com.intellij.util.ui.UIUtil; @@ -53,7 +52,7 @@ public class ProcessedModulesTable extends JPanel { myTable.setIntercellSpacing(new Dimension(0, 0)); myTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN); myTable.setColumnSelectionAllowed(false); - JBScrollPane pane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane pane = ScrollPaneFactory.createScrollPane(myTable); pane.setPreferredSize(new Dimension(100, 155)); final TableColumnModel columnModel = myTable.getColumnModel(); diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/CompoundRendererConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/CompoundRendererConfigurable.java index a2fe17314798..d28dbb4a02ec 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/CompoundRendererConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/CompoundRendererConfigurable.java @@ -32,8 +32,8 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TableUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.AbstractTableCellEditor; import com.intellij.util.ui.Table; import org.jetbrains.annotations.NonNls; @@ -266,7 +266,7 @@ public class CompoundRendererConfigurable implements UnnamedConfigurable{ myDownButton.setEnabled(enabled); } }; - final JBScrollPane scrollPane = new JBScrollPane(myTable); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); panel.add(scrollPane, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 4, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); panel.add(myAddButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(0, 4, 4, 0), 0, 0)); panel.add(myRemoveButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(0, 4, 4, 0), 0, 0)); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java b/java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java index dae88c5419f7..914146fc772a 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java @@ -38,7 +38,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.sun.jdi.*; import org.jetbrains.annotations.NonNls; @@ -98,7 +98,7 @@ public class ExportDialog extends DialogWrapper { protected JComponent createCenterPanel() { myTextArea.setEditable(false); - JBScrollPane pane = new JBScrollPane(myTextArea); + JScrollPane pane = ScrollPaneFactory.createScrollPane(myTextArea); pane.setPreferredSize(new Dimension(400, 300)); return pane; } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java index 1fedf566d2f0..1d6ac280bc4e 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java @@ -47,7 +47,7 @@ import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ComboBoxWithWidePopup; import com.intellij.ui.PopupHandler; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.sun.jdi.ObjectCollectedException; import javax.swing.*; @@ -97,7 +97,7 @@ public class FramesPanel extends UpdatableDebuggerView { setBorder(null); add(myThreadsCombo, BorderLayout.NORTH); - add(new JBScrollPane(myFramesList), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(myFramesList), BorderLayout.CENTER); } public DebuggerStateManager getContextManager() { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java index d0c097aebd38..5bdff11a9185 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java @@ -32,7 +32,7 @@ import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.ui.ScreenUtil; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.text.StringTokenizer; import com.intellij.util.ui.GeometryUtil; import com.intellij.util.ui.UIUtil; @@ -189,7 +189,7 @@ public class DebuggerTreeBase extends DnDAwareTree implements Disposable { } final JComponent tipContent = createTipContent(toolTipText, node); - final JBScrollPane scrollPane = new JBScrollPane(tipContent); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(tipContent); scrollPane.setBorder(null); scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/InspectPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/InspectPanel.java index 25da606ce7bd..5ebe1cbe28c4 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/InspectPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/InspectPanel.java @@ -28,7 +28,7 @@ import com.intellij.debugger.ui.impl.watch.NodeDescriptorImpl; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.ActionPopupMenu; import com.intellij.openapi.project.Project; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import org.jetbrains.annotations.NotNull; import java.awt.*; @@ -39,7 +39,7 @@ public class InspectPanel extends DebuggerTreePanel { getInspectTree().setInspectDescriptor(inspectDescriptor); - add(new JBScrollPane(getInspectTree()), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(getInspectTree()), BorderLayout.CENTER); final Disposable disposable = DebuggerAction.installEditAction(getInspectTree(), DebuggerActions.EDIT_NODE_SOURCE); registerDisposable(disposable); setUpdateEnabled(true); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsPanel.java index e816c366b0d5..2f8e6e118c4e 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsPanel.java @@ -30,7 +30,7 @@ import com.intellij.openapi.actionSystem.ActionPopupMenu; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import org.jetbrains.annotations.NonNls; import java.awt.*; @@ -59,7 +59,7 @@ public class ThreadsPanel extends DebuggerTreePanel{ } } }); - add(new JBScrollPane(getThreadsTree()), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(getThreadsTree()), BorderLayout.CENTER); } protected DebuggerTree createTreeView() { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/VariablesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/VariablesPanel.java index ca2fa5309422..08f65ac0a10b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/VariablesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/VariablesPanel.java @@ -22,7 +22,7 @@ import com.intellij.debugger.ui.impl.watch.DebuggerTree; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.Project; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -40,7 +40,7 @@ public class VariablesPanel extends DebuggerTreePanel implements DataProvider{ final FrameDebuggerTree frameTree = getFrameTree(); - add(new JBScrollPane(frameTree), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(frameTree), BorderLayout.CENTER); registerDisposable(DebuggerAction.installEditAction(frameTree, DebuggerActions.EDIT_NODE_SOURCE)); overrideShortcut(frameTree, DebuggerActions.SET_VALUE, new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0))); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/WatchPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/WatchPanel.java index aa9676711868..a961cdf15a47 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/WatchPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/WatchPanel.java @@ -32,7 +32,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.ActionPopupMenu; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import org.jetbrains.annotations.NonNls; import java.awt.*; @@ -43,7 +43,7 @@ public abstract class WatchPanel extends DebuggerTreePanel { public WatchPanel(Project project, DebuggerStateManager stateManager) { super(project, stateManager); - add(new JBScrollPane(getWatchTree()), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(getWatchTree()), BorderLayout.CENTER); final Disposable disposable = DebuggerAction.installEditAction(getWatchTree(), DebuggerActions.EDIT_NODE_SOURCE); registerDisposable(disposable); } diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java index 52b123138422..f6165bdc21b4 100644 --- a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java +++ b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java @@ -24,7 +24,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.PopupHandler; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.annotations.NonNls; @@ -49,7 +49,7 @@ public class PaletteWindow extends JPanel implements DataProvider { private final MyPropertyChangeListener myPropertyChangeListener = new MyPropertyChangeListener(); private final Set myGroups = new HashSet(); private final JTabbedPane myTabbedPane = new JTabbedPane(); - private final JBScrollPane myScrollPane = new JBScrollPane(); + private final JScrollPane myScrollPane = ScrollPaneFactory.createScrollPane(); private final MyListSelectionListener myListSelectionListener = new MyListSelectionListener(); private PaletteGroupHeader myLastFocusedGroup; @@ -112,7 +112,7 @@ public class PaletteWindow extends JPanel implements DataProvider { } for(String tabName: tabNames) { PaletteContentWindow contentWindow = new PaletteContentWindow(); - JBScrollPane scrollPane = new JBScrollPane(contentWindow); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(contentWindow); scrollPane.addMouseListener(new MyScrollPanePopupHandler()); myTabbedPane.add(tabName, scrollPane); for(PaletteGroup group: currentGroups) { @@ -209,12 +209,12 @@ public class PaletteWindow extends JPanel implements DataProvider { } final int tabCount = collectTabNames(myGroups).length; if (tabCount > 0) { - JBScrollPane activeScrollPane; + JScrollPane activeScrollPane; if (tabCount == 1) { activeScrollPane = myScrollPane; } else { - activeScrollPane = (JBScrollPane) myTabbedPane.getSelectedComponent(); + activeScrollPane = (JScrollPane) myTabbedPane.getSelectedComponent(); } PaletteContentWindow activeContentWindow = (PaletteContentWindow) activeScrollPane.getViewport().getView(); PaletteGroupHeader groupHeader = activeContentWindow.getLastGroupHeader(); @@ -262,7 +262,7 @@ public class PaletteWindow extends JPanel implements DataProvider { private static class MyScrollPanePopupHandler extends PopupHandler { public void invokePopup(Component comp, int x, int y) { - JBScrollPane scrollPane = (JBScrollPane) comp; + JScrollPane scrollPane = (JScrollPane) comp; PaletteContentWindow contentWindow = (PaletteContentWindow) scrollPane.getViewport().getView(); if (contentWindow != null) { PaletteGroupHeader groupHeader = contentWindow.getLastGroupHeader(); diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java index add44e023857..0f824ce895fb 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java @@ -23,8 +23,8 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.ui.ex.MultiLineLabel; import com.intellij.openapi.util.IconLoader; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Icons; import com.intellij.util.StringBuilderSpinAllocator; import org.jetbrains.annotations.NotNull; @@ -76,12 +76,12 @@ abstract class ProjectLayoutPanel extends JPanel { myDependenciesList = createList(); final Splitter splitter = new Splitter(false); - - final JBScrollPane entriesPane = new JBScrollPane(myEntriesChooser); + + final JScrollPane entriesPane = ScrollPaneFactory.createScrollPane(myEntriesChooser); entriesPane.setBorder(BorderFactory.createTitledBorder(getEntriesChooserTitle())); splitter.setFirstComponent(entriesPane); - - final JBScrollPane depsPane = new JBScrollPane(myDependenciesList); + + final JScrollPane depsPane = ScrollPaneFactory.createScrollPane(myDependenciesList); depsPane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(getDependenciesTitle()), depsPane.getBorder())); splitter.setSecondComponent(depsPane); @@ -499,7 +499,7 @@ abstract class ProjectLayoutPanel extends JPanel { final JPanel labelChooser = new JPanel(new BorderLayout()); labelChooser.add(new JLabel(getSplitDialogChooseFilesPrompt()), BorderLayout.NORTH); - labelChooser.add(new JBScrollPane(myChooser), BorderLayout.CENTER); + labelChooser.add(ScrollPaneFactory.createScrollPane(myChooser), BorderLayout.CENTER); labelChooser.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); panel.add(labelNameField, BorderLayout.NORTH); diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java index 6300b25802ec..924f2f419bf7 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java @@ -30,8 +30,8 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectJdksModel; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.wm.ex.WindowManagerEx; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import gnu.trove.TIntArrayList; import org.jetbrains.annotations.Nullable; @@ -76,7 +76,7 @@ public class JdkChooserPanel extends JPanel { }); JPanel panel = new JPanel(new BorderLayout()); - panel.add(new JBScrollPane(myList), BorderLayout.CENTER); + panel.add(ScrollPaneFactory.createScrollPane(myList), BorderLayout.CENTER); add(panel, BorderLayout.CENTER); if (myListModel.getSize() > 0) { myList.setSelectedIndex(0); diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleTypeStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleTypeStep.java index b76804dc1205..291b1bb4cd68 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleTypeStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleTypeStep.java @@ -30,7 +30,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.FieldPanel; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.EventDispatcher; import com.intellij.util.ui.UIUtil; @@ -152,13 +151,13 @@ public class ModuleTypeStep extends ModuleWizardStep { descriptionLabel.setFont(UIUtil.getLabelFont().deriveFont(Font.BOLD)); myPanel.add(descriptionLabel, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.SOUTHWEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - final JBScrollPane typesListScrollPane = ScrollPaneFactory.createScrollPane(myTypesList); + final JScrollPane typesListScrollPane = ScrollPaneFactory.createScrollPane(myTypesList); final Dimension preferredSize = calcTypeListPreferredSize(allModuleTypes); typesListScrollPane.setPreferredSize(preferredSize); typesListScrollPane.setMinimumSize(preferredSize); myPanel.add(typesListScrollPane, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.2, (createNewProject? 1.0 : 0.0), GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(0, createNewProject? 10 : 30, 0, 10), 0, 0)); - final JBScrollPane descriptionScrollPane = ScrollPaneFactory.createScrollPane(myModuleDescriptionPane); + final JScrollPane descriptionScrollPane = ScrollPaneFactory.createScrollPane(myModuleDescriptionPane); descriptionScrollPane.setPreferredSize(new Dimension(preferredSize.width * 3, preferredSize.height)); myPanel.add(descriptionScrollPane, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.8, (createNewProject? 1.0 : 0.0), GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 10), 0, 0)); diff --git a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/PathEditor.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/PathEditor.java index 70ded06044e4..bd91db835dd9 100644 --- a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/PathEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/PathEditor.java @@ -34,7 +34,6 @@ import com.intellij.openapi.vfs.ex.http.HttpFileSystem; import com.intellij.ui.ListUtil; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Icons; import com.intellij.util.containers.HashSet; import com.intellij.util.ui.UIUtil; @@ -174,7 +173,7 @@ public abstract class PathEditor { } }); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); scrollPane.setPreferredSize(new Dimension(500, 500)); myPanel.add(scrollPane, new GridBagConstraints(0, 0, 1, 8, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, anInsets, 0, 0)); myPanel.add(myAddButton, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, anInsets, 0, 0)); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java index c30ed9fbbe1b..7a656f9c40b7 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java @@ -17,8 +17,8 @@ package com.intellij.openapi.roots.ui.configuration; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.ui.popup.ListItemDescriptor; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.navigation.History; import com.intellij.ui.navigation.Place; import com.intellij.ui.popup.list.GroupedItemsListRenderer; @@ -80,7 +80,7 @@ public class SidePanel extends JPanel { myList.setCellRenderer(new GroupedItemsListRenderer(descriptor)); - add(new JBScrollPane(myList), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(myList), BorderLayout.CENTER); myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myList.addListSelectionListener(new ListSelectionListener() { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DetectedSourceRootsDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DetectedSourceRootsDialog.java index f6c339a2b81c..0675d1c25c7b 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DetectedSourceRootsDialog.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DetectedSourceRootsDialog.java @@ -20,11 +20,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TitlePanel; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.ui.CheckboxTree; -import com.intellij.ui.CheckedTreeNode; -import com.intellij.ui.ColoredTreeCellRenderer; -import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.*; import com.intellij.util.Icons; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.NonNls; @@ -61,7 +57,7 @@ public class DetectedSourceRootsDialog extends DialogWrapper { /** * A scrollable pane that contains myTree */ - private final JBScrollPane myPane; + private final JScrollPane myPane; /** * A constructor @@ -104,7 +100,7 @@ public class DetectedSourceRootsDialog extends DialogWrapper { super(project, true); myRootNode = tree; myTree = createCheckboxTree(); - myPane = new JBScrollPane(myTree); + myPane = ScrollPaneFactory.createScrollPane(myTree); setTitle("Detected Source Roots"); init(); } @@ -119,7 +115,7 @@ public class DetectedSourceRootsDialog extends DialogWrapper { super(component, true); myRootNode = tree; myTree = createCheckboxTree(); - myPane = new JBScrollPane(myTree); + myPane = ScrollPaneFactory.createScrollPane(myTree); setTitle("Detected Source Roots"); init(); } diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java index 5513a4b2347a..5ed0323ecfd0 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java @@ -24,7 +24,6 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.ui.ListUtil; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import java.awt.event.ActionEvent; @@ -49,7 +48,7 @@ public class CodeStyleGenerationConfigurable implements Configurable { private final MembersOrderList myMembersOrderList; - private JBScrollPane myMembersListScroll; + private JScrollPane myMembersListScroll; private JButton myMoveUpButton; private JButton myMoveDownButton; diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java index 00e6af7d9b8f..4df6f5cf4d24 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java @@ -22,8 +22,8 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.VerticalFlowLayout; import com.intellij.psi.PsiClass; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import java.awt.*; @@ -66,7 +66,7 @@ class RestoreReferencesDialog extends DialogWrapper { myList = new JBList(myNamedElements); myList.setCellRenderer(new FQNameCellRenderer()); myList.setBorder(BorderFactory.createEtchedBorder()); - panel.add(new JBScrollPane(myList), BorderLayout.CENTER); + panel.add(ScrollPaneFactory.createScrollPane(myList), BorderLayout.CENTER); JTextArea area = new JTextArea(myContainsClassesOnly ? CodeInsightBundle.message("dialog.paste.on.import.text") : diff --git a/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java b/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java index 7b0db29634c8..18a900516815 100644 --- a/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java +++ b/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java @@ -40,7 +40,6 @@ import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SeparatorFactory; import com.intellij.ui.SortedListModel; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.IncorrectOperationException; import com.intellij.util.Processor; import org.jetbrains.annotations.NonNls; @@ -100,7 +99,7 @@ public class SpecialAnnotationsUtil { } }); - final JBScrollPane listScrollPane = ScrollPaneFactory.createScrollPane(injectionList); + final JScrollPane listScrollPane = ScrollPaneFactory.createScrollPane(injectionList); // listScrollPane.setBorder(BorderFactory.createEtchedBorder()); listScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); listScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); diff --git a/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java b/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java index 1ef57b658c79..6949816e3d3b 100644 --- a/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java +++ b/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java @@ -35,8 +35,8 @@ import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Icons; import com.intellij.util.IncorrectOperationException; @@ -125,7 +125,7 @@ public class PackageChooserDialog extends PackageChooser { ); myTree.setBorder(BorderFactory.createEtchedBorder()); - JBScrollPane scrollPane = new JBScrollPane(myTree); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); scrollPane.setPreferredSize(new Dimension(500, 300)); new TreeSpeedSearch(myTree, new Convertor() { diff --git a/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java index 45a5d6e32725..c0f876789983 100644 --- a/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java +++ b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java @@ -41,9 +41,9 @@ import com.intellij.psi.presentation.java.SymbolPresentationUtil; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PsiShortNamesCache; import com.intellij.psi.util.PsiUtilBase; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TabbedPaneWrapper; import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; @@ -169,7 +169,7 @@ public class TreeClassChooserDialog extends DialogWrapper implements TreeClassCh myTree.setCellRenderer(new NodeRenderer()); UIUtil.setLineStyleAngled(myTree); - JBScrollPane scrollPane = new JBScrollPane(myTree); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); scrollPane.setPreferredSize(new Dimension(500, 300)); myTree.addKeyListener(new KeyAdapter() { diff --git a/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java index f237c33863af..5ae76009eeaa 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java @@ -27,7 +27,6 @@ import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.ui.StringTableCellEditor; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.usageView.UsageViewUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.Table; @@ -111,7 +110,7 @@ public class ChangeClassSignatureDialog extends RefactoringDialog { JPanel panel = new JPanel(new BorderLayout()); panel.setBorder(IdeBorderFactory.createTitledBorder(RefactoringBundle.message("changeClassSignature.parameters.panel.border.title"))); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); panel.add(scrollPane, BorderLayout.CENTER); final JPanel buttonsTable = EditableRowTable.createButtonsTable(myTable, myTableModel, true); diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java index b42320565537..f1b3fbe22eb5 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java @@ -43,7 +43,6 @@ import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.IncorrectOperationException; @@ -320,7 +319,7 @@ public class ChangeSignatureDialog extends RefactoringDialog { JPanel panel = new JPanel(new BorderLayout()); panel.setBorder(IdeBorderFactory.createTitledBorder(borderTitle)); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); JPanel tablePanel = new JPanel(new BorderLayout()); tablePanel.add(scrollPane, BorderLayout.CENTER); @@ -417,7 +416,7 @@ public class ChangeSignatureDialog extends RefactoringDialog { mySignatureArea.setEditable(false); mySignatureArea.setBackground(getContentPane().getBackground()); //mySignatureArea.setFont(myTableFont); - JBScrollPane scrollPane = new JBScrollPane(mySignatureArea); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(mySignatureArea); scrollPane.setBorder(IdeBorderFactory.createEmptyBorder(new Insets(0,0,0,0))); panel.add(scrollPane, BorderLayout.CENTER); diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/CallerChooser.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/CallerChooser.java index c4a67e0709b1..66d22e96c558 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/CallerChooser.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/CallerChooser.java @@ -33,11 +33,7 @@ import com.intellij.psi.*; import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.refactoring.RefactoringBundle; -import com.intellij.ui.CheckboxTree; -import com.intellij.ui.CheckboxTreeBase; -import com.intellij.ui.CheckedTreeNode; -import com.intellij.ui.IdeBorderFactory; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.*; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.containers.HashSet; @@ -104,7 +100,7 @@ public abstract class CallerChooser extends DialogWrapper { }; myTree.getSelectionModel().addTreeSelectionListener(myTreeSelectionListener); - JBScrollPane scrollPane = new JBScrollPane(myTree); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); splitter.setFirstComponent(scrollPane); final JComponent callSitesViewer = createCallSitesViewer(); TreePath selectionPath = myTree.getSelectionPath(); diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java index 9daee6a791ea..37a641c1063c 100644 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java @@ -31,7 +31,6 @@ import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.IconUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.EmptyIcon; @@ -390,7 +389,7 @@ public String getAccessorsVisibility() { myTable.setPreferredScrollableViewportSize(new Dimension(550, myTable.getRowHeight() * 12)); myTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); // JLabel label = new JLabel("Fields to Encapsulate"); // CompTitledBorder titledBorder = new CompTitledBorder(label); Border titledBorder = IdeBorderFactory.createTitledBorder(RefactoringBundle.message("encapsulate.fields.fields.to.encapsulate.border.title")); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java index 14bbb0587a6a..94d1829fba9d 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java @@ -30,8 +30,8 @@ import com.intellij.psi.PsiMethod; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.ui.MethodCellRenderer; import com.intellij.ui.IdeBorderFactory; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import java.awt.*; @@ -95,7 +95,7 @@ public class EnclosingMethodSelectionDialog extends DialogWrapper { int indexToSelect = 0; myEnclosingMethodsList.setSelectedIndex(indexToSelect); gbConstraints.gridy++; - panel.add(new JBScrollPane(myEnclosingMethodsList), gbConstraints); + panel.add(ScrollPaneFactory.createScrollPane(myEnclosingMethodsList), gbConstraints); return panel; } diff --git a/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java index ee67bfb58dc2..f2c73b1ad763 100644 --- a/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java @@ -22,7 +22,6 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.Table; import javax.swing.*; @@ -117,7 +116,7 @@ public class EditMigrationDialog extends DialogWrapper{ myDescriptionTextArea = new JTextArea(myMigrationMap.getDescription(), 3, 40); myDescriptionTextArea.setLineWrap(true); myDescriptionTextArea.setWrapStyleWord(true); - JBScrollPane scrollPane = new JBScrollPane(myDescriptionTextArea); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myDescriptionTextArea); scrollPane.setBorder(null); scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER); diff --git a/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java index eb2bddae2721..fa6feb7f1c03 100644 --- a/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java @@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.refactoring.HelpID; import com.intellij.refactoring.RefactoringBundle; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import javax.swing.*; import java.awt.event.ActionEvent; @@ -43,7 +43,7 @@ public class MigrationDialog extends DialogWrapper{ private final MigrationMapSet myMigrationMapSet; private JLabel promptLabel; private JSeparator mySeparator; - private JBScrollPane myDescriptionScroll; + private JScrollPane myDescriptionScroll; public MigrationDialog(Project project, MigrationMapSet migrationMapSet) { @@ -74,7 +74,7 @@ public class MigrationDialog extends DialogWrapper{ initMapCombobox(); myDescriptionTextArea = new MyTextArea("", 3, 40); - JBScrollPane scrollPane = new JBScrollPane(myDescriptionTextArea); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myDescriptionTextArea); myDescriptionScroll.getViewport().add(myDescriptionTextArea); myDescriptionScroll.setBorder(null); myDescriptionScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialog.java index 9479d6c5fa0a..5e5377257c49 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialog.java @@ -25,7 +25,6 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.move.MoveInstanceMembersUtil; import com.intellij.ui.EditorTextField; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -73,7 +72,7 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase { jLabel.setText(RefactoringBundle.message("moveInstanceMethod.select.an.instance.parameter")); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); mainPanel.add(scrollPane, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0,0,0,0), 0,0)); myVisibilityPanel = createVisibilityPanel(); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java index db37613ad780..4c2cd0817f7d 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java @@ -28,7 +28,6 @@ import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.ui.VisibilityPanel; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.usageView.UsageViewUtil; import javax.swing.*; @@ -61,7 +60,7 @@ public abstract class MoveInstanceMethodDialogBase extends RefactoringDialog { protected JPanel createListAndVisibilityPanels() { myList = createTargetVariableChooser(); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); final JPanel hBox = new JPanel(new GridBagLayout()); final GridBagConstraints gbConstraints = new GridBagConstraints(); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java index 1d291e590a59..b5bcb014ddc7 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java @@ -44,7 +44,6 @@ import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.RecentsManager; import com.intellij.ui.ReferenceEditorComboWithBrowseButton; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.usageView.UsageViewUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; @@ -193,7 +192,7 @@ public class MoveMembersDialog extends RefactoringDialog implements MoveMembersO if (table.getRowCount() > 0) { table.getSelectionModel().addSelectionInterval(0, 0); } - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); Border titledBorder = IdeBorderFactory.createTitledBorder(RefactoringBundle.message("move.members.members.to.be.moved.border.title")); Border emptyBorder = BorderFactory.createEmptyBorder(0, 5, 5, 5); Border border = BorderFactory.createCompoundBorder(titledBorder, emptyBorder); diff --git a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java index c4b1b12b8efe..7c0e18a9e65f 100644 --- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java @@ -34,7 +34,6 @@ import com.intellij.refactoring.ui.PackageNameReferenceEditorCombo; import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.Table; import org.jetbrains.annotations.NotNull; @@ -197,7 +196,7 @@ public class ReplaceConstructorWithBuilderDialog extends RefactoringDialog { myTable.setPreferredScrollableViewportSize(new Dimension(550, myTable.getRowHeight() * 12)); myTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); final Border titledBorder = IdeBorderFactory.createTitledBorder("Parameters to Pass to the Builder"); final Border emptyBorder = BorderFactory.createEmptyBorder(0, 5, 5, 5); final Border border = BorderFactory.createCompoundBorder(titledBorder, emptyBorder); diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java index a8a08a5143c1..2b004c272dfa 100644 --- a/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java @@ -28,7 +28,6 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteOverridingMethodUsageInfo; import com.intellij.ui.BooleanTableCellRenderer; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.usageView.UsageInfo; import com.intellij.usages.impl.UsagePreviewPanel; import com.intellij.util.ui.Table; @@ -168,7 +167,7 @@ class OverridingMethodsDialog extends DialogWrapper { panel.setBorder(border);*/ panel.setLayout(new BorderLayout()); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); panel.add(scrollPane, BorderLayout.CENTER); ListSelectionListener selectionListener = new ListSelectionListener() { diff --git a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java index 896414525066..876d27fa3911 100644 --- a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java @@ -34,8 +34,8 @@ import com.intellij.refactoring.ui.ClassCellRenderer; import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.RefactoringHierarchyUtil; import com.intellij.ui.IdeBorderFactory; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -110,7 +110,7 @@ public class TurnRefsToSuperDialog extends RefactoringDialog { } mySuperClassesList.setSelectedIndex(indexToSelect); gbConstraints.gridy++; - panel.add(new JBScrollPane(mySuperClassesList), gbConstraints); + panel.add(ScrollPaneFactory.createScrollPane(mySuperClassesList), gbConstraints); gbConstraints.gridy++; myCbReplaceInstanceOf.setText(RefactoringBundle.message("turnRefsToSuper.use.superclass.in.instanceof")); diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java index 61570c127bfc..13ce98c588f7 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java @@ -7,7 +7,7 @@ package com.intellij.refactoring.typeMigration.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.refactoring.RefactoringBundle; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -36,7 +36,7 @@ public class FailedConversionsDialog extends DialogWrapper { @NonNls final String contentType = "text/html"; final JEditorPane messagePane = new JEditorPane(contentType, ""); messagePane.setEditable(false); - JBScrollPane scrollPane = new JBScrollPane(messagePane); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(messagePane); scrollPane.setPreferredSize(new Dimension(500, 400)); panel.add(new JLabel(RefactoringBundle.message("the.following.problems.were.found")), BorderLayout.NORTH); panel.add(scrollPane, BorderLayout.CENTER); diff --git a/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java b/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java index 69e56df1d7ba..52691a79719a 100644 --- a/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java +++ b/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java @@ -27,7 +27,6 @@ package com.intellij.refactoring.ui; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import javax.swing.border.Border; @@ -46,7 +45,7 @@ public class MemberSelectionPanel extends JPanel { setLayout(new BorderLayout()); myTable = createMemberSelectionTable(memberInfo, abstractColumnHeader); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); add(scrollPane, BorderLayout.CENTER); diff --git a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java index 800d381e9da4..6ab2bcf8c6f4 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java +++ b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java @@ -24,7 +24,6 @@ import com.intellij.ui.BooleanTableCellRenderer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TableUtil; import com.intellij.ui.UIBundle; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.AbstractTableCellEditor; import com.intellij.util.ui.Table; import org.jetbrains.annotations.NonNls; @@ -231,7 +230,7 @@ public abstract class ParameterTablePanel extends JPanel { }); JPanel listPanel = new JPanel(new BorderLayout()); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); listPanel.add(scrollPane, BorderLayout.CENTER); listPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); add(listPanel, BorderLayout.CENTER); diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java index d75ef667c534..228a8844826a 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java @@ -52,7 +52,6 @@ import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.testIntegration.TestFramework; import com.intellij.testIntegration.TestIntegrationUtils; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -375,7 +374,7 @@ public class CreateTestDialog extends DialogWrapper { constr.gridwidth = GridBagConstraints.REMAINDER; constr.fill = GridBagConstraints.BOTH; constr.weighty = 1; - panel.add(new JBScrollPane(myMethodsTable), constr); + panel.add(ScrollPaneFactory.createScrollPane(myMethodsTable), constr); return panel; } diff --git a/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java b/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java index 17018274803c..eb35783a9f64 100644 --- a/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java +++ b/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java @@ -24,12 +24,8 @@ import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ToolWindowId; import com.intellij.openapi.wm.ToolWindowManager; -import com.intellij.ui.ColoredListCellRenderer; -import com.intellij.ui.LayeredIcon; -import com.intellij.ui.LightColors; -import com.intellij.ui.SimpleTextAttributes; +import com.intellij.ui.*; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -92,7 +88,7 @@ public class ThreadDumpPanel extends JPanel { add(ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, toolbarActions,false).getComponent(), BorderLayout.WEST); final Splitter splitter = new Splitter(false, 0.3f); - splitter.setFirstComponent(new JBScrollPane(myThreadList)); + splitter.setFirstComponent(ScrollPaneFactory.createScrollPane(myThreadList)); splitter.setSecondComponent(consoleView.getComponent()); add(splitter, BorderLayout.CENTER); diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java b/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java index ffe0535e5e5e..3678f2812dd9 100644 --- a/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java @@ -1,4 +1,4 @@ -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import javax.swing.*; import java.awt.*; @@ -13,7 +13,7 @@ public class ComponentCaller extends JComponent{ private void buildUI() { setLayout(new BorderLayout()); - add(new JBScrollPane(component1)); + add(ScrollPaneFactory.createScrollPane((Component)component1)); } public void doSomething(){ diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java b/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java index ffe0535e5e5e..3678f2812dd9 100644 --- a/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java @@ -1,4 +1,4 @@ -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import javax.swing.*; import java.awt.*; @@ -13,7 +13,7 @@ public class ComponentCaller extends JComponent{ private void buildUI() { setLayout(new BorderLayout()); - add(new JBScrollPane(component1)); + add(ScrollPaneFactory.createScrollPane((Component)component1)); } public void doSomething(){ diff --git a/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java b/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java index f2f29bd8cbf6..cb964f5b21c3 100644 --- a/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java +++ b/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java @@ -29,7 +29,6 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TableUtil; import com.intellij.ui.UIBundle; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.ItemRemovable; import com.intellij.util.ui.Table; import com.intellij.util.ui.UIUtil; @@ -68,7 +67,7 @@ public class ClassFilterEditor extends JPanel { myAddPatternButton = new JButton(getAddPatternButtonText()); myRemoveButton = new JButton(UIBundle.message("button.remove")); myTable = new Table(); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); add(scrollPane, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 3, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(4, 4, 4, 6), 0, 0)); add(myAddClassButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(4, 0, 0, 4), 0, 0)); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java index f8d7e2b65f03..c32a59d42181 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java @@ -19,7 +19,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CustomCodeStyleSettings; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; @@ -52,7 +52,7 @@ public abstract class OptionTreeWithPreviewPanel extends MultilanguageCodeStyleA myOptionsTree = createOptionsTree(); myOptionsTree.setCellRenderer(new MyTreeCellRenderer()); - myPanel.add(new JBScrollPane(myOptionsTree), + myPanel.add(ScrollPaneFactory.createScrollPane(myOptionsTree), new GridBagConstraints(0, 0, 1, 1, 0, 1, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(7, 7, 3, 4), 0, 0)); diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/OptionsPanelImpl.java b/platform/lang-impl/src/com/intellij/application/options/colors/OptionsPanelImpl.java index d2d781bedb59..d3d295d1f078 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/OptionsPanelImpl.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/OptionsPanelImpl.java @@ -17,8 +17,8 @@ package com.intellij.application.options.colors; import com.intellij.ui.ListScrollingUtil; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.EventDispatcher; import javax.swing.*; @@ -75,7 +75,7 @@ public class OptionsPanelImpl extends JPanel implements OptionsPanel { myOptionsList.setModel(new DefaultListModel()); myOptionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - JBScrollPane scrollPane = new JBScrollPane(myOptionsList); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myOptionsList); scrollPane.setPreferredSize(new Dimension(230, 60)); JPanel north = new JPanel(new BorderLayout()); north.add(scrollPane, BorderLayout.WEST); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java index eb5b1fdbd7e9..af28c5a55eeb 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java @@ -32,7 +32,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.SmartPointerManager; import com.intellij.psi.SmartPsiElementPointer; import com.intellij.ui.EdgeBorder; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.containers.HashMap; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -74,7 +74,7 @@ public class DocumentationComponent extends JPanel implements Disposable { } } - private final JBScrollPane myScrollPane; + private final JScrollPane myScrollPane; private final JEditorPane myEditorPane; private String myText; // myEditorPane.getText() surprisingly crashes.., let's cache the text private final JPanel myControlPanel; @@ -133,7 +133,7 @@ public class DocumentationComponent extends JPanel implements Disposable { myEditorPane.setEditable(false); myEditorPane.setBackground(HintUtil.INFORMATION_COLOR); myEditorPane.setEditorKit(UIUtil.getHTMLEditorKit()); - myScrollPane = new JBScrollPane(myEditorPane); + myScrollPane = ScrollPaneFactory.createScrollPane(myEditorPane); myScrollPane.setBorder(null); final MouseAdapter mouseAdapter = new MouseAdapter() { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/InspectionDescriptionLinkHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/InspectionDescriptionLinkHandler.java index 41302c3bc0dd..df0a82458909 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/InspectionDescriptionLinkHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/InspectionDescriptionLinkHandler.java @@ -27,7 +27,6 @@ import com.intellij.profile.codeInspection.InspectionProfileManager; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -68,7 +67,7 @@ public class InspectionDescriptionLinkHandler extends TooltipLinkHandler { final JEditorPane pane = LineTooltipRenderer.initPane(description); pane.select(0, 0); pane.setPreferredSize(new Dimension(3 * tooltip.getPreferredSize().width /2, 200)); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(pane); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(pane); scrollPane.setBorder(null); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); final JBPopup popup = JBPopupFactory.getInstance().createComponentPopupBuilder(scrollPane, scrollPane).createPopup(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java index de7e778be702..fe02fb4b3f17 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java @@ -29,11 +29,7 @@ import com.intellij.openapi.actionSystem.ActionToolbar; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.util.Ref; import com.intellij.packageDependencies.ui.TreeExpansionMonitor; -import com.intellij.ui.CheckboxTree; -import com.intellij.ui.CheckedTreeNode; -import com.intellij.ui.FilterComponent; -import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.*; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; @@ -95,7 +91,7 @@ public abstract class IntentionSettingsTree { myFilter = new MyFilterComponent(); myComponent = new JPanel(new BorderLayout()); - JBScrollPane scrollPane = new JBScrollPane(myTree); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); myToolbarPanel = new JPanel(new BorderLayout()); myToolbarPanel.add(createTreeToolbarPanel().getComponent(), BorderLayout.WEST); myToolbarPanel.add(myFilter, BorderLayout.CENTER); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java index 22ec2cbe7a38..51e6ceef73c7 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java @@ -40,8 +40,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.ui.LightweightHint; import com.intellij.ui.ListScrollingUtil; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.plaf.beg.BegPopupMenuBorder; import com.intellij.ui.popup.PopupIcons; import com.intellij.util.CollectConsumer; @@ -127,7 +127,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myList.setBackground(LookupCellRenderer.BACKGROUND_COLOR); - JBScrollPane scrollPane = new JBScrollPane(myList); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); getComponent().add(scrollPane, BorderLayout.NORTH); scrollPane.setBorder(null); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java index 70d616b84d97..e212476b5c04 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java @@ -31,7 +31,6 @@ import com.intellij.ui.CheckboxTree; import com.intellij.ui.CheckedTreeNode; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Alarm; import com.intellij.util.ui.ColumnInfo; import com.intellij.util.ui.update.UiNotifyConnector; @@ -750,7 +749,7 @@ class TemplateListPanel extends JPanel { } ); - JBScrollPane scrollpane = ScrollPaneFactory.createScrollPane(myTree); + JScrollPane scrollpane = ScrollPaneFactory.createScrollPane(myTree); if (myTemplateGroups.size() > 0) { myTree.setSelectionInterval(0, 0); } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java index 21894739584a..9e77886ddec5 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java @@ -48,8 +48,8 @@ import com.intellij.openapi.util.IconLoader; import com.intellij.ui.LightColors; import com.intellij.ui.ListUtil; import com.intellij.ui.ReorderableListController; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -106,7 +106,7 @@ public class SeverityEditorDialog extends DialogWrapper { } }); myOptionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - JBScrollPane scrollPane = new JBScrollPane(myOptionsList); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myOptionsList); scrollPane.setPreferredSize(new Dimension(230, 60)); JPanel leftPanel = new JPanel(new BorderLayout()); leftPanel.add(scrollPane, BorderLayout.CENTER); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/Browser.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/Browser.java index 1c95ec564dd6..ebfe2512189c 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/Browser.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/Browser.java @@ -32,7 +32,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.psi.PsiElement; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -250,7 +250,7 @@ public class Browser extends JPanel { }; myHTMLViewer.addHyperlinkListener(myHyperLinkListener); - add(new JBScrollPane(myHTMLViewer), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(myHTMLViewer), BorderLayout.CENTER); } public void addClickListener(ClickListener listener) { diff --git a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConfigurationPanel.java b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConfigurationPanel.java index 295b1d80af50..e62ebf5f3c3a 100644 --- a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConfigurationPanel.java +++ b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConfigurationPanel.java @@ -27,7 +27,6 @@ import com.intellij.openapi.util.Comparing; import com.intellij.ui.BooleanTableCellRenderer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TableUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.table.TableView; import com.intellij.util.ui.AbstractTableCellEditor; import com.intellij.util.ui.CellEditorComponentWithBrowseButton; @@ -125,7 +124,7 @@ public class LogConfigurationPanel extends Setti myRemoveButton.setEnabled(myFilesTable.getSelectedRowCount() >=1); } }); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myFilesTable); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myFilesTable); scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); myScrollPanel.add(scrollPane, BorderLayout.CENTER); myWholePanel.setPreferredSize(new Dimension(-1, 150)); diff --git a/platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java b/platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java index 297dc877dd79..1fb5bcb6941e 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java @@ -22,8 +22,8 @@ import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Key; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.StringSetSpinAllocator; import com.intellij.util.ui.UIUtil; @@ -105,7 +105,7 @@ public abstract class BaseExecuteBeforeRunDialog extend expacndChecked(tree); - JBScrollPane scrollPane = new JBScrollPane(tree); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(tree); scrollPane.setPreferredSize(new Dimension(400, 400)); panel.add(scrollPane, BorderLayout.CENTER); return panel; diff --git a/platform/lang-impl/src/com/intellij/execution/impl/DefaultConfigurationSettingsEditor.java b/platform/lang-impl/src/com/intellij/execution/impl/DefaultConfigurationSettingsEditor.java index cb3ed137db16..56265066a2a5 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/DefaultConfigurationSettingsEditor.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/DefaultConfigurationSettingsEditor.java @@ -23,7 +23,6 @@ import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.NonNls; @@ -59,7 +58,7 @@ public class DefaultConfigurationSettingsEditor implements Configurable { public JComponent createComponent() { final JPanel wholePanel = new JPanel(new BorderLayout()); - final JBScrollPane pane = ScrollPaneFactory.createScrollPane(myTree); + final JScrollPane pane = ScrollPaneFactory.createScrollPane(myTree); pane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); wholePanel.add(pane, BorderLayout.WEST); final JPanel rightPanel = new JPanel(new BorderLayout()); diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java index e85e33c7b7d9..ffce688156de 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -41,7 +41,6 @@ import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Key; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ArrayUtil; import com.intellij.util.config.StorageAccessors; @@ -318,7 +317,7 @@ class RunConfigurable extends BaseConfigurable { true).getComponent(); leftPanel.add(myToolbarComponent, BorderLayout.NORTH); initTree(); - final JBScrollPane pane = ScrollPaneFactory.createScrollPane(myTree); + final JScrollPane pane = ScrollPaneFactory.createScrollPane(myTree); pane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); leftPanel.add(pane, BorderLayout.CENTER); final JButton editDefaultsButton = new JButton(ExecutionBundle.message("run.configuration.edit.default.configuration.settings.button")); diff --git a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java index 1fbb29a6f4d5..1a7eea21c846 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java @@ -26,7 +26,6 @@ import com.intellij.openapi.options.SettingsEditorConfigurable; import com.intellij.openapi.options.SettingsEditorListener; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.DocumentAdapter; -import com.intellij.ui.components.JBScrollPane; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -209,7 +208,7 @@ public final class SingleConfigurationConfigurable 1) { myScrollPanel.add(new JPanel(), new GridBagConstraints(0, 1, 1, 1, 0.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0)); - JBScrollPane attrScroll = new JBScrollPane(myScrollPanel); + JScrollPane attrScroll = ScrollPaneFactory.createScrollPane(myScrollPanel); attrScroll.setViewportBorder(null); myMainPanel.add(attrScroll, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0)); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java index c95b312f8c93..0fb5c4ccabcf 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java @@ -41,7 +41,7 @@ import com.intellij.pom.Navigatable; import com.intellij.psi.*; import com.intellij.psi.search.scope.packageSet.NamedScope; import com.intellij.psi.search.scope.packageSet.NamedScopesHolder; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.EditSourceOnDoubleClickHandler; @@ -148,7 +148,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem return HierarchyBrowserBaseEx.this.getPrevOccurenceActionNameImpl(); } }); - myTreePanel.add(new JBScrollPane(tree), key); + myTreePanel.add(ScrollPaneFactory.createScrollPane(tree), key); } final JPanel legendPanel = createLegendPanel(); diff --git a/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java b/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java index 94f9ece0b488..066b358540d7 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java @@ -23,8 +23,8 @@ import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -129,7 +129,7 @@ public final class MacrosDialog extends DialogWrapper { constr.insets = new Insets(0, 5, 0, 5); constr.fill = GridBagConstraints.BOTH; constr.anchor = GridBagConstraints.WEST; - panel.add(new JBScrollPane(myMacrosList), constr); + panel.add(ScrollPaneFactory.createScrollPane(myMacrosList), constr); myMacrosList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myMacrosList.setPreferredSize(null); @@ -150,7 +150,7 @@ public final class MacrosDialog extends DialogWrapper { constr.fill = GridBagConstraints.BOTH; constr.anchor = GridBagConstraints.WEST; constr.insets = new Insets(0, 5, 5, 5); - panel.add(new JBScrollPane(myPreviewTextarea), constr); + panel.add(ScrollPaneFactory.createScrollPane(myPreviewTextarea), constr); myPreviewTextarea.setEditable(false); myPreviewTextarea.setLineWrap(true); myPreviewTextarea.setPreferredSize(null); diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java index 5129d042ff16..b7a959bebdd1 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java @@ -24,7 +24,7 @@ import com.intellij.ide.ui.UISettings; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.impl.IdeRootPaneNorthExtension; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -52,7 +52,7 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension { myPanel.setBackground(UIUtil.getListBackground()); myNavigationBar = new NavBarPanel(myProject); - JBScrollPane scroller = new JBScrollPane(myNavigationBar); + JScrollPane scroller = ScrollPaneFactory.createScrollPane(myNavigationBar); scroller.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER); scroller.setHorizontalScrollBar(null); scroller.setBorder(null); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPSIPane.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPSIPane.java index 5fa5df2aca65..1cbb4e554756 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPSIPane.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPSIPane.java @@ -33,8 +33,8 @@ import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.OpenSourceUtil; import com.intellij.util.ui.UIUtil; @@ -56,7 +56,7 @@ import java.util.ArrayList; import java.util.StringTokenizer; public abstract class AbstractProjectViewPSIPane extends AbstractProjectViewPane { - private JBScrollPane myComponent; + private JScrollPane myComponent; protected AbstractProjectViewPSIPane(Project project) { super(project); @@ -69,7 +69,7 @@ public abstract class AbstractProjectViewPSIPane extends AbstractProjectViewPane DefaultTreeModel treeModel = new DefaultTreeModel(rootNode); myTree = createTree(treeModel); enableDnD(); - myComponent = new JBScrollPane(myTree); + myComponent = ScrollPaneFactory.createScrollPane(myTree); myTreeStructure = createStructure(); setTreeBuilder(createBuilder(treeModel)); diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java index bc6fc9c25852..9323ec533c83 100644 --- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java @@ -64,9 +64,9 @@ import com.intellij.psi.search.scope.packageSet.NamedScope; import com.intellij.psi.search.scope.packageSet.NamedScopesHolder; import com.intellij.psi.search.scope.packageSet.PackageSet; import com.intellij.ui.ColoredTreeCellRenderer; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.Function; import com.intellij.util.containers.HashSet; @@ -121,7 +121,7 @@ public class ScopeTreeViewPanel extends JPanel implements JDOMExternalizable, Di myProject = project; initTree(); - add(new JBScrollPane(myTree), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(myTree), BorderLayout.CENTER); myDependencyValidationManager = DependencyValidationManager.getInstance(myProject); final UiNotifyConnector uiNotifyConnector = new UiNotifyConnector(myTree, myUpdateQueue); diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java index e1b4dbbc8fab..d6d8ffd3832c 100644 --- a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java +++ b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java @@ -47,8 +47,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.impl.source.tree.CompositeElement; import com.intellij.ui.AutoScrollFromSourceHandler; import com.intellij.ui.AutoScrollToSourceHandler; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; @@ -142,7 +142,7 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre } }); - setContent(new JBScrollPane(myAbstractTreeBuilder.getTree())); + setContent(ScrollPaneFactory.createScrollPane(myAbstractTreeBuilder.getTree())); myAbstractTreeBuilder.getTree().setCellRenderer(new NodeRenderer()); diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java index 4ac33b59250e..aaa333c25d3a 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java @@ -48,8 +48,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.ui.AutoScrollToSourceHandler; import com.intellij.ui.PopupHandler; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.content.Content; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.EditSourceOnDoubleClickHandler; @@ -149,7 +149,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig } } ); - setContent(new JBScrollPane(myTree)); + setContent(ScrollPaneFactory.createScrollPane(myTree)); // Create tool bars and register custom shortcuts diff --git a/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java b/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java index 1617f01b6682..5dba7815e98b 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java @@ -25,7 +25,6 @@ import com.intellij.openapi.ui.Messages; import com.intellij.psi.search.TodoPattern; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.Table; import javax.swing.*; @@ -131,7 +130,7 @@ class FilterDialog extends DialogWrapper { Border border = IdeBorderFactory.createTitledBorder(IdeBundle.message("group.todo.filter.patterns")); patternsPanel.setBorder(border); myTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); scrollPane.setPreferredSize(new Dimension(550, myTable.getRowHeight() * 10)); patternsPanel.add(scrollPane, new GridBagConstraints(0, 0, 1, 1, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); diff --git a/platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java b/platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java index abef7b89ce6a..3cb5d9ff3eeb 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java @@ -30,7 +30,6 @@ import com.intellij.psi.search.TodoPattern; import com.intellij.ui.PanelWithButtons; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TableUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.Table; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -197,7 +196,7 @@ public class TodoConfigurable extends BaseConfigurable implements SearchableConf ((DefaultCellEditor)myPatternsTable.getDefaultEditor(String.class)).setClickCountToStart(2); - JBScrollPane myPatternsScroll = ScrollPaneFactory.createScrollPane(myPatternsTable); + JScrollPane myPatternsScroll = ScrollPaneFactory.createScrollPane(myPatternsTable); // myPatternsScroll.getViewport().add(myPatternsTable); myPatternsScroll.setPreferredSize(new Dimension(-1, myPatternsTable.getRowHeight() * 12)); @@ -290,7 +289,7 @@ public class TodoConfigurable extends BaseConfigurable implements SearchableConf protected JComponent createMainComponent() { myFiltersTable = new Table(myFiltersModel); myFiltersTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - JBScrollPane myFiltersScroll = ScrollPaneFactory.createScrollPane(myFiltersTable); + JScrollPane myFiltersScroll = ScrollPaneFactory.createScrollPane(myFiltersTable); // myFiltersScroll.getViewport().add(myFiltersTable); myFiltersScroll.setPreferredSize(new Dimension(-1, myPatternsTable.getRowHeight() * 12)); diff --git a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java index 57f3bd68c9bd..b83a088dcca9 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java @@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiManager; import com.intellij.refactoring.RefactoringBundle; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ArrayUtil; import com.intellij.util.Icons; import org.jetbrains.annotations.NonNls; @@ -119,7 +119,7 @@ public class DirectoryChooser extends DialogWrapper { }; myView.onSelectionChange(runnable); final JComponent component = myView.getComponent(); - final JBScrollPane jScrollPane = new JBScrollPane(component); + final JScrollPane jScrollPane = ScrollPaneFactory.createScrollPane(component); //noinspection HardCodedStringLiteral int prototypeWidth = component.getFontMetrics(component.getFont()).stringWidth("X:\\1234567890\\1234567890\\com\\company\\system\\subsystem"); jScrollPane.setPreferredSize(new Dimension(Math.max(300, prototypeWidth),300)); diff --git a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java index bd9fdc576c8e..1904a8185cf1 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java +++ b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java @@ -31,8 +31,8 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.ui.ColoredTreeCellRenderer; import com.intellij.ui.NonFocusableCheckBox; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Icons; import com.intellij.util.SmartList; @@ -314,7 +314,7 @@ public class MemberChooser extends DialogWrapper implemen } ); TreeUtil.installActions(myTree); - JBScrollPane scrollPane = new JBScrollPane(myTree); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); scrollPane.setPreferredSize(new Dimension(350, 450)); panel.add(scrollPane, BorderLayout.CENTER); diff --git a/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java b/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java index 67af79a1b2a6..80ebe053c2d8 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java @@ -45,9 +45,9 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.psi.search.FilenameIndex; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TabbedPaneWrapper; import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; @@ -169,7 +169,7 @@ public final class TreeFileChooserDialog extends DialogWrapper implements TreeFi myTree.setCellRenderer(new NodeRenderer()); UIUtil.setLineStyleAngled(myTree); - final JBScrollPane scrollPane = new JBScrollPane(myTree); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); scrollPane.setPreferredSize(new Dimension(500, 300)); myTree.addKeyListener(new KeyAdapter() { diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java index 8a2b13dddb38..0543a0771e95 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java @@ -48,8 +48,8 @@ import com.intellij.psi.statistics.StatisticsManager; import com.intellij.psi.util.proximity.PsiProximityComparator; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.ListScrollingUtil; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.popup.PopupOwner; import com.intellij.ui.popup.PopupUpdateProcessor; import com.intellij.util.Alarm; @@ -92,7 +92,7 @@ public abstract class ChooseByNameBase{ /** the tool area of the popup, it is just after card box */ protected JComponent myToolArea; - protected JBScrollPane myListScrollPane; // Located in the layered pane + protected JScrollPane myListScrollPane; // Located in the layered pane protected JList myList; private DefaultListModel myListModel; private List> myHistory; @@ -463,7 +463,7 @@ public abstract class ChooseByNameBase{ } }); - myListScrollPane = new JBScrollPane(myList); + myListScrollPane = ScrollPaneFactory.createScrollPane(myList); if (!UIUtil.isMotifLookAndFeel()) { UIUtil.installPopupMenuBorder(myTextFieldPanel); diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java index 2003ce972c2c..28d29a52eec3 100644 --- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java +++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java @@ -49,11 +49,11 @@ import com.intellij.psi.PsiReference; import com.intellij.psi.search.FilenameIndex; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiUtilBase; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SortedComboBoxModel; import com.intellij.ui.TitledBorderWithMnemonic; import com.intellij.ui.TreeSpeedSearch; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.UIUtil; @@ -140,14 +140,14 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider { myTree.addTreeSelectionListener(new MyTreeSelectionListener()); - JBScrollPane scrollPane = new JBScrollPane(myTree); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); JPanel panel = new JPanel(new BorderLayout()); panel.add(scrollPane, BorderLayout.CENTER); myStructureTreePanel.setLayout(new BorderLayout()); myStructureTreePanel.add(panel, BorderLayout.CENTER); myRefs = new JBList(new DefaultListModel()); - JBScrollPane refScrollPane = new JBScrollPane(myRefs); + JScrollPane refScrollPane = ScrollPaneFactory.createScrollPane(myRefs); JPanel refPanel = new JPanel(new BorderLayout()); refPanel.add(refScrollPane, BorderLayout.CENTER); myReferencesPanel.setLayout(new BorderLayout()); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java index 36d694b9f6cb..6a95caae6da5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java @@ -42,7 +42,6 @@ import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.openapi.vfs.ex.VirtualFileManagerAdapter; import com.intellij.openapi.vfs.ex.VirtualFileManagerEx; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.roots.ToolbarPanel; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -152,7 +151,7 @@ public class CommonContentEntriesEditor extends ModuleElementsEditor { myEditorsPanel = new ScrollablePanel(new VerticalStackLayout()); myEditorsPanel.setBackground(BACKGROUND_COLOR); - JBScrollPane myScrollPane = ScrollPaneFactory.createScrollPane(myEditorsPanel); + JScrollPane myScrollPane = ScrollPaneFactory.createScrollPane(myEditorsPanel); entriesPanel.add(new ToolbarPanel(myScrollPane, group), BorderLayout.CENTER); final Splitter splitter = new Splitter(false); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryTreeEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryTreeEditor.java index f506ee62a747..a6326de4eaf0 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryTreeEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryTreeEditor.java @@ -42,7 +42,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.roots.ToolbarPanel; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ui.tree.TreeUtil; @@ -88,7 +87,7 @@ public class ContentEntryTreeEditor { new TreeSpeedSearch(myTree); myTreePanel = new MyPanel(new BorderLayout()); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); myTreePanel.add(new ToolbarPanel(scrollPane, myEditingActionsGroup), BorderLayout.CENTER); myTreePanel.setVisible(false); diff --git a/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java b/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java index e49394fab69d..d45b473a824c 100644 --- a/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java +++ b/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java @@ -28,7 +28,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.ShadowAction; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ColorChooser; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.table.JBTable; import org.jetbrains.annotations.Nullable; @@ -85,10 +85,10 @@ public class RegistryUi implements Disposable { myDescriptionLabel = new JTextArea(3, 50); myDescriptionLabel.setEditable(false); - final JBScrollPane label = new JBScrollPane(myDescriptionLabel); + final JScrollPane label = ScrollPaneFactory.createScrollPane(myDescriptionLabel); label.setBorder(new TitledBorder("Description")); - myContent.add(new JBScrollPane(myTable), BorderLayout.CENTER); + myContent.add(ScrollPaneFactory.createScrollPane(myTable), BorderLayout.CENTER); myContent.add(label, BorderLayout.SOUTH); myTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() { diff --git a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java index 5ec369d1912e..46cec76a118e 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java +++ b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java @@ -29,7 +29,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.table.JBTable; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; @@ -44,7 +43,7 @@ import java.util.Map; public class FileEncodingConfigurable implements SearchableConfigurable, NonDefaultProjectConfigurable, OptionalConfigurable { private final Project myProject; private FileTreeTable myTreeView; - private JBScrollPane myTreePanel; + private JScrollPane myTreePanel; private JPanel myPanel; private JCheckBox myAutodetectUTFEncodedFilesCheckBox; private JCheckBox myTransparentNativeToAsciiCheckBox; diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java index 37104913f2a6..b48e9f3f2828 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java @@ -54,7 +54,6 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.search.scope.packageSet.NamedScope; import com.intellij.psi.search.scope.packageSet.PackageSet; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.content.Content; import com.intellij.ui.treeStructure.Tree; import com.intellij.usageView.UsageViewBundle; @@ -761,7 +760,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide pane.setForeground(Color.black); pane.setBackground(HintUtil.INFORMATION_COLOR); pane.setOpaque(true); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(pane); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(pane); final Dimension dimension = pane.getPreferredSize(); scrollPane.setMinimumSize(new Dimension(dimension.width, dimension.height + 20)); scrollPane.setPreferredSize(new Dimension(dimension.width, dimension.height + 20)); diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java index 33486388b916..65e9977934f4 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java @@ -56,7 +56,6 @@ import com.intellij.profile.codeInspection.ui.actions.DeleteScopeAction; import com.intellij.profile.codeInspection.ui.actions.MoveScopeAction; import com.intellij.psi.search.scope.packageSet.NamedScope; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; @@ -510,7 +509,7 @@ public class SingleInspectionProfilePanel extends JPanel { myTree.setSelectionModel(new DefaultTreeSelectionModel()); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); TreeUtil.collapseAll(myTree, 1); final Dimension preferredSize = new Dimension(myTree.getPreferredSize().width + 20, scrollPane.getPreferredSize().height); diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractParameterTablePanel.java b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractParameterTablePanel.java index ed0433ab3878..68bd15b5584b 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractParameterTablePanel.java +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractParameterTablePanel.java @@ -18,7 +18,6 @@ package com.intellij.refactoring.extractMethod; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TableUtil; import com.intellij.ui.UIBundle; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.Table; import org.jetbrains.annotations.NonNls; @@ -147,7 +146,7 @@ public abstract class AbstractParameterTablePanel extends JPanel { }); JPanel listPanel = new JPanel(new BorderLayout()); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); listPanel.add(scrollPane, BorderLayout.CENTER); listPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); add(listPanel, BorderLayout.CENTER); diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java index d7faef78882e..321e7ee1f25c 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java @@ -23,7 +23,7 @@ package com.intellij.refactoring.safeDelete; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.refactoring.RefactoringBundle; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -53,7 +53,7 @@ public class UnsafeUsagesDialog extends DialogWrapper { @NonNls final String contentType = "text/html"; myMessagePane = new JEditorPane(contentType, ""); myMessagePane.setEditable(false); - JBScrollPane scrollPane = new JBScrollPane(myMessagePane); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myMessagePane); scrollPane.setPreferredSize(new Dimension(500, 400)); panel.add(new JLabel(RefactoringBundle.message("the.following.problems.were.found")), BorderLayout.NORTH); panel.add(scrollPane, BorderLayout.CENTER); diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java index 15a891b3f565..5a422db4bb99 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java @@ -28,8 +28,8 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringBundle; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; import com.intellij.usageView.UsageInfo; import com.intellij.usages.*; import com.intellij.util.ArrayUtil; @@ -105,7 +105,7 @@ public class ConflictsDialog extends DialogWrapper{ @NonNls final String contentType = "text/html"; final JEditorPane messagePane = new JEditorPane(contentType, ""); messagePane.setEditable(false); - JBScrollPane scrollPane = new JBScrollPane(messagePane); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(messagePane); scrollPane.setPreferredSize(new Dimension(500, 400)); panel.add(new JLabel(RefactoringBundle.message("the.following.problems.were.found")), BorderLayout.NORTH); panel.add(scrollPane, BorderLayout.CENTER); diff --git a/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java b/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java index 370c8717ed7b..3cd6458957fc 100644 --- a/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java +++ b/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java @@ -23,7 +23,6 @@ import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.*; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -187,7 +186,7 @@ class OutputFiltersDialog extends DialogWrapper { JPanel panel = new JPanel(new BorderLayout()); - panel.add(new JBScrollPane(myFiltersList), BorderLayout.CENTER); + panel.add(ScrollPaneFactory.createScrollPane(myFiltersList), BorderLayout.CENTER); panel.add(myButtonGroup, BorderLayout.EAST); panel.setPreferredSize(new Dimension(400, 200)); diff --git a/platform/lang-impl/src/com/intellij/tools/ToolsPanel.java b/platform/lang-impl/src/com/intellij/tools/ToolsPanel.java index 5fa053bb171c..ac40a143d574 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolsPanel.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolsPanel.java @@ -23,7 +23,6 @@ import com.intellij.ui.CheckboxTree; import com.intellij.ui.CheckedTreeNode; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.Nullable; @@ -108,7 +107,7 @@ class ToolsPanel extends JPanel { myTree.setRootVisible(false); - JBScrollPane tableScrollPane = ScrollPaneFactory.createScrollPane(myTree); + JScrollPane tableScrollPane = ScrollPaneFactory.createScrollPane(myTree); setLayout(new GridBagLayout()); diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java index 8eaccb694e88..87b2d994847e 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java @@ -32,7 +32,7 @@ import com.intellij.openapi.util.objectTree.ObjectNode; import com.intellij.openapi.util.objectTree.ObjectTree; import com.intellij.openapi.util.objectTree.ObjectTreeListener; import com.intellij.openapi.vcs.history.TextTransferrable; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.debugger.UiDebuggerExtension; import com.intellij.ui.speedSearch.ElementFilter; import com.intellij.ui.tabs.JBTabs; @@ -134,7 +134,7 @@ public class DisposerDebugger implements UiDebuggerExtension, Disposable { myAllocation.setEditable(false); setLayout(new BorderLayout()); - add(new JBScrollPane(myAllocation), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(myAllocation), BorderLayout.CENTER); treeTabs.addListener(new TabsListener.Adapter() { @@ -241,7 +241,7 @@ public class DisposerDebugger implements UiDebuggerExtension, Disposable { myTree = tree; setLayout(new BorderLayout()); - add(new JBScrollPane(myTree), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(myTree), BorderLayout.CENTER); Disposer.getTree().addListener(this); diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java index c6b65b77c271..2c311ee6aabe 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java @@ -21,10 +21,10 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ColoredListCellRenderer; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleColoredText; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.debugger.UiDebuggerExtension; import javax.swing.*; @@ -72,8 +72,8 @@ public class FocusDebugger implements UiDebuggerExtension, PropertyChangeListene final Splitter splitter = new Splitter(true); - splitter.setFirstComponent(new JBScrollPane(myLog)); - splitter.setSecondComponent(new JBScrollPane(myAllocation)); + splitter.setFirstComponent(ScrollPaneFactory.createScrollPane(myLog)); + splitter.setSecondComponent(ScrollPaneFactory.createScrollPane(myAllocation)); myLog.addListSelectionListener(this); diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java index 17f0e66a10c1..a35917a9c968 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java @@ -41,9 +41,9 @@ import com.intellij.openapi.wm.WindowManager; import com.intellij.openapi.wm.ex.WindowManagerEx; import com.intellij.openapi.wm.impl.IdeFrameImpl; import com.intellij.ui.ColoredListCellRenderer; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.debugger.UiDebuggerExtension; import com.intellij.util.WaitFor; import com.intellij.util.ui.UIUtil; @@ -143,11 +143,11 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta //} final Splitter script2Log = new Splitter(true); - script2Log.setFirstComponent(new JBScrollPane(myEditor.getComponent())); + script2Log.setFirstComponent(ScrollPaneFactory.createScrollPane(myEditor.getComponent())); myList = new JBList(myMessage); myList.setCellRenderer(new MyListRenderer()); - script2Log.setSecondComponent(new JBScrollPane(myList)); + script2Log.setSecondComponent(ScrollPaneFactory.createScrollPane(myList)); myComponent.add(script2Log, BorderLayout.CENTER); diff --git a/platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java b/platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java index 5fd06aaa5449..53b5e0b1b674 100644 --- a/platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java +++ b/platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java @@ -33,7 +33,6 @@ import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.ReorderableListController; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Icons; import com.intellij.util.PathUtil; import gnu.trove.THashSet; @@ -96,7 +95,7 @@ public class SimpleClasspathPanel extends JPanel { } }); add(ActionManager.getInstance().createActionToolbar(ActionPlaces.PROJECT_VIEW_TOOLBAR, actionGroup, true).getComponent(), BorderLayout.NORTH); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); add(scrollPane, BorderLayout.CENTER); final FontMetrics fontMetrics = myList.getFontMetrics(myList.getFont()); scrollPane.setPreferredSize(new Dimension(0, fontMetrics.getHeight() * 12)); diff --git a/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java b/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java index 0faa17749ab6..fbebf35b94f6 100644 --- a/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java +++ b/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java @@ -27,7 +27,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ColoredTableCellRenderer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.table.JBTable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -51,7 +50,7 @@ public abstract class LanguagePerFileConfigurable implements SearchableConfig private final String myOverrideQuestion; private final String myOverrideTitle; private final AbstractFileTreeTable myTreeView; - private JBScrollPane myTreePanel; + private JScrollPane myTreePanel; private JPanel myPanel; private JLabel myLabel; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java index a6a50e391829..5507f2a9cef2 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java @@ -51,7 +51,6 @@ import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.PopupHandler; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.awt.RelativePoint; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Consumer; import com.intellij.util.ImageLoader; import com.intellij.util.ui.AbstractLayoutManager; @@ -209,7 +208,7 @@ public abstract class HistoryDialog extends FrameW toolBarPanel.setPreferredSize(new Dimension(1, prefToolBarSize.height)); } result.add(toolBarPanel, BorderLayout.NORTH); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myRevisionsList.getComponent()); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myRevisionsList.getComponent()); scrollPane.setBorder(IdeBorderFactory.createSimpleBorder(1, 0, 0, 1)); result.add(scrollPane, BorderLayout.CENTER); diff --git a/platform/platform-api/src/com/intellij/execution/util/ExecutionErrorDialog.java b/platform/platform-api/src/com/intellij/execution/util/ExecutionErrorDialog.java index c8a3ecbb768d..3902786896c0 100644 --- a/platform/platform-api/src/com/intellij/execution/util/ExecutionErrorDialog.java +++ b/platform/platform-api/src/com/intellij/execution/util/ExecutionErrorDialog.java @@ -22,7 +22,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogBuilder; import com.intellij.openapi.ui.Messages; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -55,7 +55,7 @@ public class ExecutionErrorDialog { textArea.setText(message); textArea.setWrapStyleWord(false); textArea.setLineWrap(true); - final JBScrollPane scrollPane = new JBScrollPane(textArea); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(textArea); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); final JPanel panel = new JPanel(new BorderLayout(10, 0)); panel.setPreferredSize(new Dimension(500, 200)); diff --git a/platform/platform-api/src/com/intellij/openapi/editor/actions/ContentChooser.java b/platform/platform-api/src/com/intellij/openapi/editor/actions/ContentChooser.java index 2e696c6dea5c..2c5a41f017fe 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/actions/ContentChooser.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/actions/ContentChooser.java @@ -25,9 +25,9 @@ import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.ColoredListCellRenderer; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import javax.swing.*; @@ -117,7 +117,7 @@ public abstract class ContentChooser extends DialogWrapper { }); mySplitter = new Splitter(true); - mySplitter.setFirstComponent(new JBScrollPane(myList)); + mySplitter.setFirstComponent(ScrollPaneFactory.createScrollPane(myList)); mySplitter.setSecondComponent(new JPanel()); updateViewerForSelection(); @@ -164,7 +164,7 @@ public abstract class ContentChooser extends DialogWrapper { textArea.setSelectionStart(0); textArea.setSelectionEnd(textArea.getText().length()); textArea.setEditable(false); - mySplitter.setSecondComponent(new JBScrollPane(textArea)); + mySplitter.setSecondComponent(ScrollPaneFactory.createScrollPane(textArea)); } mySplitter.revalidate(); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java index 56a5b223efec..58247f1ad278 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java @@ -34,7 +34,6 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.navigation.History; import com.intellij.ui.navigation.Place; import com.intellij.ui.treeStructure.Tree; @@ -88,7 +87,7 @@ public abstract class MasterDetailsComponent implements Configurable, Persistent public void queryPlace(@NotNull final Place place) { } }); - private JBScrollPane myMaster; + private JScrollPane myMaster; public void setHistory(final History history) { myHistory = history; @@ -163,7 +162,7 @@ public abstract class MasterDetailsComponent implements Configurable, Persistent }; left.add(myNorthPanel, BorderLayout.NORTH); - myMaster = new JBScrollPane(myTree); + myMaster = ScrollPaneFactory.createScrollPane(myTree); left.add(myMaster, BorderLayout.CENTER); mySplitter.setFirstComponent(left); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java index 8a7167a979fa..71c391d97f9d 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java @@ -26,7 +26,6 @@ import com.intellij.ui.BrowserHyperlinkListener; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.InsertPathAction; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; @@ -469,7 +468,7 @@ public class Messages { textArea.setText(textField.getText().replaceAll("[\\ ]*=[\\ ]*", "=").replaceAll(" ", "\n")); InsertPathAction.copyFromTo(textField, textArea); DialogBuilder builder = new DialogBuilder(textField); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(textArea); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(textArea); builder.setDimensionServiceKey(dimensionServiceKey); builder.setCenterPanel(scrollPane); builder.setPreferedFocusComponent(textArea); @@ -588,7 +587,7 @@ public class Messages { final Dimension screenSize = messageComponent.getToolkit().getScreenSize(); final Dimension textSize = messageComponent.getPreferredSize(); if (textSize.width > screenSize.width * 4 / 5 || textSize.height > screenSize.height / 2) { - final JBScrollPane pane = ScrollPaneFactory.createScrollPane(messageComponent); + final JScrollPane pane = ScrollPaneFactory.createScrollPane(messageComponent); pane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); pane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/StripeTable.java b/platform/platform-api/src/com/intellij/openapi/ui/StripeTable.java index 030ae41859ac..78b5d9c84994 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/StripeTable.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/StripeTable.java @@ -16,7 +16,7 @@ package com.intellij.openapi.ui; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.Table; import javax.swing.*; @@ -83,7 +83,7 @@ public class StripeTable extends Table { } public static JScrollPane createScrollPane(JTable table) { - JBScrollPane scrollPane = new JBScrollPane(table); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); scrollPane.setViewport(new StripedViewport(table)); scrollPane.getViewport().setView(table); scrollPane.setBorder(UIManager.getBorder("Table.scrollPaneBorder")); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java index eb2491801946..326629e7b17a 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java @@ -22,6 +22,7 @@ import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Pair; import com.intellij.ui.InplaceButton; import com.intellij.ui.ListScrollingUtil; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.speedSearch.ListWithFilter; import com.intellij.ui.treeStructure.treetable.TreeTable; @@ -202,7 +203,7 @@ public class PopupChooserBuilder { registerClosePopupKeyboardAction(keystroke, true); } - final JBScrollPane scrollPane; + final JScrollPane scrollPane; if (myChooserComponent instanceof ListWithFilter) { scrollPane = ((ListWithFilter)myChooserComponent).getScrollPane(); } @@ -297,7 +298,7 @@ public class PopupChooserBuilder { TreeUtil.expandAll(((TreeTable)table).getTree()); } - JBScrollPane scrollPane = new JBScrollPane(table); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); scrollPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); @@ -334,7 +335,7 @@ public class PopupChooserBuilder { private JScrollPane createScrollPane(final JTree tree) { TreeUtil.expandAll(tree); - JBScrollPane scrollPane = new JBScrollPane(tree); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(tree); scrollPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); diff --git a/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java b/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java index 5519127add1b..ecc05a1b1378 100644 --- a/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java +++ b/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java @@ -22,7 +22,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.FixedSizeButton; import com.intellij.openapi.ui.TextFieldWithBrowseButton; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Icons; import javax.swing.*; @@ -210,7 +209,7 @@ public abstract class AbstractFieldPanel extends JPanel { } }.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)), myTextArea); - return new JBScrollPane(myTextArea); + return ScrollPaneFactory.createScrollPane(myTextArea); } } } diff --git a/platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java b/platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java index 12f2724b0928..ce082e39a706 100644 --- a/platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java +++ b/platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java @@ -15,9 +15,12 @@ */ package com.intellij.ui; + + import com.intellij.ui.components.JBScrollPane; import javax.swing.*; +import java.awt.*; /** * @author beg @@ -30,7 +33,15 @@ public class ScrollPaneFactory { return new JBScrollPane(); } - public static JScrollPane createScrollPane(JComponent view) { + public static JScrollPane createScrollPane(Component view) { return new JBScrollPane(view); } + + public static JScrollPane createScrollPane(int vsbPolicy, int hsbPolicy) { + return new JBScrollPane(vsbPolicy, hsbPolicy); + } + + public static JScrollPane createScrollPane(Component view, int vsbPolicy, int hsbPolicy) { + return new JBScrollPane(view, vsbPolicy, hsbPolicy); + } } diff --git a/platform/platform-api/src/com/intellij/ui/speedSearch/ListWithFilter.java b/platform/platform-api/src/com/intellij/ui/speedSearch/ListWithFilter.java index e074a310ff9e..0bf94fa98ab8 100644 --- a/platform/platform-api/src/com/intellij/ui/speedSearch/ListWithFilter.java +++ b/platform/platform-api/src/com/intellij/ui/speedSearch/ListWithFilter.java @@ -21,7 +21,7 @@ package com.intellij.ui.speedSearch; import com.intellij.openapi.util.Condition; import com.intellij.ui.LightColors; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.Function; import javax.swing.*; @@ -33,11 +33,11 @@ public class ListWithFilter extends JPanel { private final JList myList; private final JTextField mySpeedSearchPatternField; private final NameFilteringListModel myModel; - private final JBScrollPane myScroller; + private final JScrollPane myScroller; private final MySpeedSearch mySpeedSearch; public static JComponent wrap(JList list) { - return wrap(list, new JBScrollPane(list), new Function() { + return wrap(list, ScrollPaneFactory.createScrollPane(list), new Function() { public String fun(Object o) { return o.toString(); } diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsTest.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsTest.java index 1148eb0737d4..e23b39a411c5 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsTest.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsTest.java @@ -18,8 +18,8 @@ package com.intellij.ui.tabs.impl; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.IconLoader; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.tabs.JBTabsPosition; import com.intellij.ui.tabs.TabInfo; import com.intellij.ui.tabs.TabsListener; @@ -218,7 +218,7 @@ public class JBTabsTest { final JLabel tb = new JLabel("Side comp"); tb.setBorder(new LineBorder(Color.red)); - tabs.addTab(new TabInfo(new JBScrollPane(text)).setSideComponent(tb)).setText("Text text text"); + tabs.addTab(new TabInfo(ScrollPaneFactory.createScrollPane(text)).setSideComponent(tb)).setText("Text text text"); tabs.addTab(toAnimate1).append("Tree2", new SimpleTextAttributes(SimpleTextAttributes.STYLE_WAVED, Color.black, Color.red)); tabs.addTab(new TabInfo(new JTable())).setText("Table 1").setActions(new DefaultActionGroup(), null); tabs.addTab(new TabInfo(new JTable())).setText("Table 2").setActions(new DefaultActionGroup(), null); diff --git a/platform/platform-impl/src/com/intellij/application/options/SelectFontDialog.java b/platform/platform-impl/src/com/intellij/application/options/SelectFontDialog.java index fa06df47e175..28285c55fa3b 100644 --- a/platform/platform-impl/src/com/intellij/application/options/SelectFontDialog.java +++ b/platform/platform-impl/src/com/intellij/application/options/SelectFontDialog.java @@ -19,8 +19,8 @@ import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.ListScrollingUtil; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.containers.HashMap; import javax.swing.*; @@ -83,7 +83,7 @@ public class SelectFontDialog extends DialogWrapper { JPanel panel = new JPanel(new BorderLayout()); panel.add(myShowMonospacedCheckbox, BorderLayout.NORTH); - panel.add(new JBScrollPane(myFontList), BorderLayout.CENTER); + panel.add(ScrollPaneFactory.createScrollPane(myFontList), BorderLayout.CENTER); SwingUtilities.invokeLater(new Runnable() { public void run() { diff --git a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.java b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.java index cb5f6d9f1560..4402e1531ba4 100644 --- a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.java +++ b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.java @@ -19,7 +19,6 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.text.StringTokenizer; import javax.swing.*; @@ -37,7 +36,7 @@ public class PathMacroListEditor { JButton myAddButton; JButton myRemoveButton; JButton myEditButton; - JBScrollPane myScrollPane; + JScrollPane myScrollPane; private JTextField myIgnoredVariables; private PathMacroTable myPathMacroTable; diff --git a/platform/platform-impl/src/com/intellij/codeInsight/hint/LineTooltipRenderer.java b/platform/platform-impl/src/com/intellij/codeInsight/hint/LineTooltipRenderer.java index 2c3685f425e8..e6ed3096f99f 100644 --- a/platform/platform-impl/src/com/intellij/codeInsight/hint/LineTooltipRenderer.java +++ b/platform/platform-impl/src/com/intellij/codeInsight/hint/LineTooltipRenderer.java @@ -27,7 +27,6 @@ import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.LightweightHint; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -76,7 +75,7 @@ public class LineTooltipRenderer implements TooltipRenderer { int widthLimit = layeredPane.getWidth() - 10; int heightLimit = layeredPane.getHeight() - 5; - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(pane); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(pane); scrollPane.setBorder(null); int width = expanded ? 3 * myCurrentWidth / 2 : pane.getPreferredSize().width; int height = expanded ? Math.max(pane.getPreferredSize().height, 150) : pane.getPreferredSize().height; diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java index 428d14cb62e2..b49a67bbb6f2 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java @@ -45,7 +45,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.text.DateFormatUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -311,7 +311,7 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene JPanel gapPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 7, 0)); gapPanel.add(myInfoLabel); infoPanel.add(gapPanel, BorderLayout.NORTH); - infoPanel.add(new JBScrollPane(myDetailsPane), BorderLayout.CENTER); + infoPanel.add(ScrollPaneFactory.createScrollPane(myDetailsPane), BorderLayout.CENTER); root.add(infoPanel, BorderLayout.CENTER); root.add(myImmediatePopupCheckbox, BorderLayout.SOUTH); diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java b/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java index fa91898890ab..bb8919a436ef 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java +++ b/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java @@ -23,7 +23,7 @@ import com.intellij.featureStatistics.ProductivityFeaturesRegistry; import com.intellij.ide.util.TipUIUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import javax.swing.*; import java.awt.*; @@ -62,7 +62,7 @@ public class AdaptiveTipDialog extends DialogWrapper { myBrowser = new JEditorPane("text/html", ""); - panel.add(new JBScrollPane(myBrowser)); + panel.add(ScrollPaneFactory.createScrollPane(myBrowser)); panel.setPreferredSize(new Dimension(DEFAULT_WIDTH, DEFAULT_HEIGHT)); return panel; } diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.java b/platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.java index e0bb799c183c..23eccdcf10eb 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.java +++ b/platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.java @@ -26,7 +26,6 @@ import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.IconLoader; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Alarm; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -55,7 +54,7 @@ public class ProgressTipPanel { private Runnable myLastRequest; private JButton myCloseButton; private JCheckBox myKeepOpen; - private JBScrollPane myScrollPane; + private JScrollPane myScrollPane; private static final @NonNls String KEEP_OPTION_NAME = "KEEP_PRODUCTIVITY_HINTS"; private boolean myIsShownIsOwnDialog = false; diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java index f269940e88fe..d2ec4fb49caa 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java @@ -30,7 +30,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; import com.intellij.ui.AutoScrollToSourceHandler; import com.intellij.ui.PopupHandler; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.content.Content; import com.intellij.ui.content.MessageView; import com.intellij.ui.treeStructure.Tree; @@ -132,7 +131,7 @@ public class NewErrorTreeViewPanel extends JPanel implements DataProvider, Occur myTree.setShowsRootHandles(true); myTree.setLargeModel(true); - JBScrollPane scrollPane = NewErrorTreeRenderer.install(myTree); + JScrollPane scrollPane = NewErrorTreeRenderer.install(myTree); myMessagePanel.add(scrollPane, BorderLayout.CENTER); if (createToolbar) { diff --git a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java index db4b9e75d91d..93e0ae9a312f 100644 --- a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java +++ b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java @@ -21,12 +21,8 @@ import com.intellij.ide.highlighter.custom.SyntaxTable; import com.intellij.openapi.fileTypes.impl.AbstractFileType; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; -import com.intellij.ui.DialogButtonGroup; -import com.intellij.ui.IdeBorderFactory; -import com.intellij.ui.ListUtil; -import com.intellij.ui.TabbedPaneWrapper; +import com.intellij.ui.*; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import java.awt.*; @@ -239,7 +235,7 @@ public class CustomFileTypeEditor extends SettingsEditor { JPanel keywordsPanel = panel; keywordsPanel.setLayout(new BorderLayout()); - keywordsPanel.add(new JBScrollPane(myKeywordsLists[index]), BorderLayout.CENTER); + keywordsPanel.add(ScrollPaneFactory.createScrollPane(myKeywordsLists[index]), BorderLayout.CENTER); DialogButtonGroup buttonGroup = new DialogButtonGroup(); buttonGroup.setBorder(BorderFactory.createEmptyBorder(0, 10, 5, 0)); diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java index bd67f2f0fae8..b043800ecfc9 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java @@ -33,7 +33,6 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Function; import com.intellij.util.concurrency.SwingWorker; import com.intellij.util.net.HTTPProxySettingsDialog; @@ -114,7 +113,7 @@ public class PluginManagerMain implements Disposable { installedPluginTable.setColumnWidth(2, 45); - JBScrollPane installedScrollPane = ScrollPaneFactory.createScrollPane(installedPluginTable); + JScrollPane installedScrollPane = ScrollPaneFactory.createScrollPane(installedPluginTable); installedPluginTable.registerKeyboardAction(new ActionListener() { public void actionPerformed(ActionEvent e) { final int column = InstalledPluginsTableModel.getCheckboxColumn(); @@ -137,7 +136,7 @@ public class PluginManagerMain implements Disposable { availablePluginsTable = new PluginTable(availablePluginsModel); // Downloads availablePluginsTable.setColumnWidth(1, 70); - JBScrollPane availableScrollPane = ScrollPaneFactory.createScrollPane(availablePluginsTable); + JScrollPane availableScrollPane = ScrollPaneFactory.createScrollPane(availablePluginsTable); installTableActions(installedPluginTable); installTableActions(availablePluginsTable); diff --git a/platform/platform-impl/src/com/intellij/ide/util/ElementsChooser.java b/platform/platform-impl/src/com/intellij/ide/util/ElementsChooser.java index 15fc447258f9..d505e1c0a5bd 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/ElementsChooser.java +++ b/platform/platform-impl/src/com/intellij/ide/util/ElementsChooser.java @@ -18,7 +18,6 @@ package com.intellij.ide.util; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SpeedSearchBase; import com.intellij.ui.TableUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.Table; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; @@ -64,7 +63,7 @@ public class ElementsChooser extends JPanel { myTable.setTableHeader(null); myTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN); myTable.setColumnSelectionAllowed(false); - JBScrollPane pane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane pane = ScrollPaneFactory.createScrollPane(myTable); pane.setPreferredSize(new Dimension(100, 155)); int width = new JCheckBox().getPreferredSize().width; TableColumnModel columnModel = myTable.getColumnModel(); diff --git a/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java b/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java index a02339ef6f81..576023d8c3b1 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java @@ -27,7 +27,7 @@ import com.intellij.openapi.ui.FixedSizeButton; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.WindowManager; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.SystemProperties; import javax.swing.*; @@ -106,7 +106,7 @@ public class ExportToFileUtil { private final Project myProject; private final ExporterToTextFile myExporter; protected JTextArea myTextArea; - protected JBScrollPane myTextScrollPane; + protected JScrollPane myTextScrollPane; protected JTextField myTfFile; protected JButton myFileButton; private ChangeListener myListener; @@ -151,7 +151,7 @@ public class ExportToFileUtil { protected JComponent createCenterPanel() { myTextArea = new JTextArea(); myTextArea.setEditable(false); - myTextScrollPane = new JBScrollPane(myTextArea); + myTextScrollPane = ScrollPaneFactory.createScrollPane(myTextArea); myTextScrollPane.setPreferredSize(new Dimension(400, 300)); return myTextScrollPane; } diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java index f8ef53669f7f..14fce215abec 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java @@ -24,7 +24,7 @@ import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.JDOMUtil; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import org.jdom.Document; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -79,7 +79,7 @@ public class TipPanel extends JPanel { } } ); - JBScrollPane scrollPane = new JBScrollPane(browser); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(browser); add(scrollPane, BorderLayout.CENTER); myCheckBox = new JCheckBox(IdeBundle.message("checkbox.show.tips.on.startup"), true); myCheckBox.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); diff --git a/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java b/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java index 8605962e7378..ffa226b08673 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java @@ -26,8 +26,8 @@ import com.intellij.openapi.ui.popup.*; import com.intellij.openapi.ui.popup.util.MinimizeButton; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.wm.impl.content.GraphicsConfig; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.panels.Wrapper; import com.intellij.util.NotNullFunction; import com.intellij.util.Processor; @@ -595,7 +595,7 @@ public class NotificationsListPanel extends JPanel implements NotificationModelL // TODO: switch filter if removed all of the notifications from current one! final ItemsList list = new ItemsList(model); - final JBScrollPane scrollPane = new JBScrollPane(list); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(list); scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorEx.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorEx.java index 6f0d2eee495a..d57e1cfb1dc5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorEx.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorEx.java @@ -29,6 +29,7 @@ import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import javax.swing.*; import java.awt.*; import java.awt.event.KeyEvent; import java.beans.PropertyChangeListener; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index cddce73c88fa..4c09f1fc8f4b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -110,7 +110,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi private final DocumentImpl myDocument; private final JPanel myPanel; - private final JBScrollPane myScrollPane; + private final JScrollPane myScrollPane; private final EditorComponentImpl myEditorComponent; private final EditorGutterComponentImpl myGutterComponent; @@ -554,7 +554,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi final Component[] components = getComponents(); final Rectangle r = getBounds(); for (Component c : components) { - if (c instanceof JBScrollPane) { + if (c instanceof JScrollPane) { c.setBounds(0, 0, r.width, r.height); } else { diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/LeftHandScrollbarLayout.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/LeftHandScrollbarLayout.java index 1d68189dfb6e..03c85d6b327e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/LeftHandScrollbarLayout.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/LeftHandScrollbarLayout.java @@ -15,8 +15,6 @@ */ package com.intellij.openapi.editor.impl; -import com.intellij.ui.components.JBScrollPane; - import javax.swing.*; import javax.swing.border.Border; import java.awt.*; @@ -32,7 +30,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The scrollpane's viewport child. * Default is an empty JViewport. * - * @see com.intellij.ui.components.JBScrollPane#setViewport + * @see javax.swing.JScrollPane#setViewport */ protected JViewport viewport; @@ -41,7 +39,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The scrollpane's vertical scrollbar child. * Default is a JScrollBar. * - * @see com.intellij.ui.components.JBScrollPane#setVerticalScrollBar + * @see javax.swing.JScrollPane#setVerticalScrollBar */ protected JScrollBar vsb; @@ -50,7 +48,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The scrollpane's horizontal scrollbar child. * Default is a JScrollBar. * - * @see com.intellij.ui.components.JBScrollPane#setHorizontalScrollBar + * @see javax.swing.JScrollPane#setHorizontalScrollBar */ protected JScrollBar hsb; @@ -58,7 +56,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { /** * The row header child. Default is null. * - * @see com.intellij.ui.components.JBScrollPane#setRowHeader + * @see javax.swing.JScrollPane#setRowHeader */ protected JViewport rowHead; @@ -66,7 +64,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { /** * The column header child. Default is null. * - * @see com.intellij.ui.components.JBScrollPane#setColumnHeader + * @see javax.swing.JScrollPane#setColumnHeader */ protected JViewport colHead; @@ -75,7 +73,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The component to display in the lower left corner. * Default is null. * - * @see com.intellij.ui.components.JBScrollPane#setCorner + * @see javax.swing.JScrollPane#setCorner */ protected Component lowerLeft; @@ -84,7 +82,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The component to display in the lower right corner. * Default is null. * - * @see com.intellij.ui.components.JBScrollPane#setCorner + * @see javax.swing.JScrollPane#setCorner */ protected Component lowerRight; @@ -93,7 +91,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The component to display in the upper left corner. * Default is null. * - * @see com.intellij.ui.components.JBScrollPane#setCorner + * @see javax.swing.JScrollPane#setCorner */ protected Component upperLeft; @@ -102,7 +100,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The component to display in the upper right corner. * Default is null. * - * @see com.intellij.ui.components.JBScrollPane#setCorner + * @see javax.swing.JScrollPane#setCorner */ protected Component upperRight; @@ -113,7 +111,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { *

* This field is obsolete, please use the JScrollPane field instead. * - * @see com.intellij.ui.components.JBScrollPane#setVerticalScrollBarPolicy + * @see javax.swing.JScrollPane#setVerticalScrollBarPolicy */ protected int vsbPolicy = VERTICAL_SCROLLBAR_AS_NEEDED; @@ -124,7 +122,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { *

* This field is obsolete, please use the JScrollPane field instead. * - * @see com.intellij.ui.components.JBScrollPane#setHorizontalScrollBarPolicy + * @see javax.swing.JScrollPane#setHorizontalScrollBarPolicy */ protected int hsbPolicy = HORIZONTAL_SCROLLBAR_AS_NEEDED; @@ -352,7 +350,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * scrollable contents. * * @return the JViewport object that displays the scrollable contents - * @see com.intellij.ui.components.JBScrollPane#getViewport + * @see javax.swing.JScrollPane#getViewport */ public JViewport getViewport() { return viewport; @@ -363,7 +361,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * Returns the JScrollBar object that handles horizontal scrolling. * * @return the JScrollBar object that handles horizontal scrolling - * @see com.intellij.ui.components.JBScrollPane#getHorizontalScrollBar + * @see javax.swing.JScrollPane#getHorizontalScrollBar */ public JScrollBar getHorizontalScrollBar() { return hsb; @@ -373,7 +371,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * Returns the JScrollBar object that handles vertical scrolling. * * @return the JScrollBar object that handles vertical scrolling - * @see com.intellij.ui.components.JBScrollPane#getVerticalScrollBar + * @see javax.swing.JScrollPane#getVerticalScrollBar */ public JScrollBar getVerticalScrollBar() { return vsb; @@ -384,7 +382,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * Returns the JViewport object that is the row header. * * @return the JViewport object that is the row header - * @see com.intellij.ui.components.JBScrollPane#getRowHeader + * @see javax.swing.JScrollPane#getRowHeader */ public JViewport getRowHeader() { return rowHead; @@ -395,7 +393,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * Returns the JViewport object that is the column header. * * @return the JViewport object that is the column header - * @see com.intellij.ui.components.JBScrollPane#getColumnHeader + * @see javax.swing.JScrollPane#getColumnHeader */ public JViewport getColumnHeader() { return colHead; @@ -409,7 +407,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * @return the Component at the specified corner, as defined in * {@link ScrollPaneConstants}; if key is not one of the * four corners, null is returned - * @see com.intellij.ui.components.JBScrollPane#getCorner + * @see javax.swing.JScrollPane#getCorner */ public Component getCorner(String key) { if (key.equals(LOWER_LEFT_CORNER)) { @@ -449,7 +447,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { /* Sync the (now obsolete) policy fields with the * JScrollPane. */ - JBScrollPane scrollPane = (JBScrollPane)parent; + JScrollPane scrollPane = (JScrollPane)parent; vsbPolicy = scrollPane.getVerticalScrollBarPolicy(); hsbPolicy = scrollPane.getHorizontalScrollBarPolicy(); @@ -567,7 +565,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { /* Sync the (now obsolete) policy fields with the * JScrollPane. */ - JBScrollPane scrollPane = (JBScrollPane)parent; + JScrollPane scrollPane = (JScrollPane)parent; vsbPolicy = scrollPane.getVerticalScrollBarPolicy(); hsbPolicy = scrollPane.getHorizontalScrollBarPolicy(); @@ -667,7 +665,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { /* Sync the (now obsolete) policy fields with the * JScrollPane. */ - JBScrollPane scrollPane = (JBScrollPane)parent; + JScrollPane scrollPane = (JScrollPane)parent; vsbPolicy = scrollPane.getVerticalScrollBarPolicy(); hsbPolicy = scrollPane.getHorizontalScrollBarPolicy(); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java index a5f299b274ed..2995e30be3a6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java @@ -36,7 +36,6 @@ import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.event.VisibleAreaEvent; import com.intellij.openapi.editor.event.VisibleAreaListener; import com.intellij.openapi.editor.ex.util.EditorUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.Nullable; @@ -199,7 +198,7 @@ public class ScrollingModelImpl implements ScrollingModel { } } - JBScrollPane scrollPane = myEditor.getScrollPane(); + JScrollPane scrollPane = myEditor.getScrollPane(); hOffset = Math.max(0, hOffset); vOffset = Math.max(0, vOffset); hOffset = Math.min(scrollPane.getHorizontalScrollBar().getMaximum() - getExtent(scrollPane.getHorizontalScrollBar()), hOffset); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java index 7a3d0a314e0d..c14395735dd3 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java @@ -34,8 +34,8 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.UIBundle; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.labels.LinkLabel; import com.intellij.ui.components.labels.LinkListener; import com.intellij.util.containers.HashMap; @@ -200,7 +200,7 @@ public class FileChooserDialogImpl extends DialogWrapper implements FileChooserD registerMouseListener(group); - JBScrollPane scrollPane = new JBScrollPane(myFileSystemTree.getTree()); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myFileSystemTree.getTree()); //scrollPane.setBorder(BorderFactory.createLineBorder(new Color(148, 154, 156))); panel.add(scrollPane, BorderLayout.CENTER); panel.setPreferredSize(new Dimension(400, 400)); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java index b9d43775f845..30531a735a3a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java @@ -29,7 +29,6 @@ import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ColoredTreeCellRenderer; import com.intellij.ui.LayeredIcon; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.ui.treeStructure.treetable.TreeTableModel; import com.intellij.util.Alarm; @@ -56,7 +55,7 @@ public class ActionsTree { private final JTree myTree; private DefaultMutableTreeNode myRoot; - private final JBScrollPane myComponent; + private final JScrollPane myComponent; private Keymap myKeymap; private Group myMainGroup = new Group("", null, null); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java index 0e6f27403b35..d3fcf860199e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java @@ -28,7 +28,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy; import com.intellij.ui.IdeBorderFactory; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; @@ -115,7 +115,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { myConflictInfoArea.setBackground(panel.getBackground()); myConflictInfoArea.setLineWrap(true); myConflictInfoArea.setWrapStyleWord(true); - final JBScrollPane conflictInfoScroll = new JBScrollPane(myConflictInfoArea); + final JScrollPane conflictInfoScroll = ScrollPaneFactory.createScrollPane(myConflictInfoArea); conflictInfoScroll.setPreferredSize(new Dimension(260, 60)); conflictInfoScroll.setBorder(null); conflictsPanel.add(conflictInfoScroll); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java index b5dec298f828..c028263d6159 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java @@ -44,7 +44,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.packageDependencies.ui.TreeExpansionMonitor; import com.intellij.ui.*; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Alarm; import com.intellij.util.containers.HashMap; import com.intellij.util.ui.UIUtil; @@ -233,7 +232,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable { myShortcutsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myShortcutsList.setCellRenderer(new ShortcutListRenderer()); currentKeysLabel.setLabelFor(myShortcutsList); - JBScrollPane scrollPane = new JBScrollPane(myShortcutsList); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myShortcutsList); scrollPane.setPreferredSize(new Dimension(160, 200)); panel.add(scrollPane, new GridBagConstraints(1,1,1,1,1,1,GridBagConstraints.WEST,GridBagConstraints.BOTH, new Insets(0, 0, 0, 2), 0, 0)); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java index c4dbde307958..81631b536deb 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java @@ -23,7 +23,7 @@ import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.IdeBorderFactory; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; @@ -179,7 +179,7 @@ class MouseShortcutDialog extends DialogWrapper{ new GridBagConstraints(0,3,1,1,1,1,GridBagConstraints.CENTER,GridBagConstraints.BOTH,new Insets(0,0,0,0),0,0) ); myTarConflicts.setPreferredSize(new Dimension(260,60)); - JBScrollPane scrollPane=new JBScrollPane(myTarConflicts); + JScrollPane scrollPane= ScrollPaneFactory.createScrollPane(myTarConflicts); scrollPane.setBorder(null); conflictsPanel.add( scrollPane, diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java index 1195bbfcdbb9..93465b29aa45 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java @@ -38,7 +38,6 @@ import com.intellij.ui.ListScrollingUtil; import com.intellij.ui.ReorderableListController; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.Nls; @@ -68,7 +67,7 @@ public class QuickListsPanel extends JPanel implements SearchableConfigurable, M private final KeymapPanel myKeymapPanel; private JComponent myToolbar; private DetailsComponent myDetailsComponent; - private JBScrollPane myListScrollPane; + private JScrollPane myListScrollPane; public QuickListsPanel(KeymapPanel panel) { super(new BorderLayout()); diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ControlPanelSettingsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ControlPanelSettingsEditor.java index 9ee6a40d0594..3cbe23ebbbb1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ControlPanelSettingsEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ControlPanelSettingsEditor.java @@ -43,7 +43,6 @@ import com.intellij.ui.DocumentAdapter; import com.intellij.ui.LabeledIcon; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TitledSeparator; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Alarm; import com.intellij.util.Consumer; import com.intellij.util.ui.UIUtil; @@ -132,7 +131,7 @@ public class ControlPanelSettingsEditor extends DialogWrapper { new Insets(0, 0, 0, 0), 0, 0)); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(panel); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(panel); scrollPane.setBorder(null); return scrollPane; } diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ExplorerSettingsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ExplorerSettingsEditor.java index bccb703f43c1..c042456bbc9b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ExplorerSettingsEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ExplorerSettingsEditor.java @@ -38,7 +38,6 @@ import com.intellij.ui.ColoredTreeCellRenderer; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; @@ -264,7 +263,7 @@ public class ExplorerSettingsEditor extends DialogWrapper { initTree(); initToolbar(); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); @@ -282,7 +281,7 @@ public class ExplorerSettingsEditor extends DialogWrapper { myOptionsPanel.setBorder(BorderFactory.createEmptyBorder(15, 5, 2, 5)); - JBScrollPane optionsScrollForTinyScreens = new JBScrollPane(myOptionsPanel); + JScrollPane optionsScrollForTinyScreens = ScrollPaneFactory.createScrollPane(myOptionsPanel); optionsScrollForTinyScreens.setBorder(null); myComponentPanel.add(optionsScrollForTinyScreens, BorderLayout.CENTER); diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java index 311aded2cb00..882b0a6e6f3b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java @@ -35,8 +35,8 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.EdtRunnable; import com.intellij.openapi.wm.IdeGlassPaneUtil; import com.intellij.ui.LightColors; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SearchTextField; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.panels.NonOpaquePanel; import com.intellij.ui.components.panels.Wrapper; import com.intellij.ui.navigation.History; @@ -583,7 +583,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat if (c != null) { if (scrollable) { - JBScrollPane scroll = new JBScrollPane(c); + JScrollPane scroll = ScrollPaneFactory.createScrollPane(c); scroll.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); scroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); scroll.setBorder(null); diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java index 88833b0f341e..140bef2c6caf 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java @@ -24,11 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.SystemInfo; -import com.intellij.ui.ErrorLabel; -import com.intellij.ui.GroupedElementsRenderer; -import com.intellij.ui.LoadingNode; -import com.intellij.ui.TreeUIHelper; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.*; import com.intellij.ui.components.panels.NonOpaquePanel; import com.intellij.ui.treeStructure.*; import com.intellij.ui.treeStructure.filtered.FilteringTreeBuilder; @@ -115,7 +111,7 @@ public class OptionsTree extends JPanel implements Disposable, OptionsEditorColl } }); - final JBScrollPane scrolls = new JBScrollPane(myTree); + final JScrollPane scrolls = ScrollPaneFactory.createScrollPane(myTree); scrolls.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); add(scrolls, BorderLayout.CENTER); diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/DefineMacrosDialog.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/DefineMacrosDialog.java index d1b7aab4950b..cce1525ff51a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/impl/DefineMacrosDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/DefineMacrosDialog.java @@ -19,7 +19,7 @@ import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.ui.IdeBorderFactory; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.Table; import gnu.trove.TObjectIntHashMap; @@ -81,7 +81,7 @@ public class DefineMacrosDialog extends DialogWrapper{ JLabel label = new JLabel(ProjectBundle.message("project.macros.prompt")); label.setBorder(IdeBorderFactory.createEmptyBorder(6, 6, 6, 6)); panel.add(label, BorderLayout.NORTH); - panel.add(new JBScrollPane(table), BorderLayout.CENTER); + panel.add(ScrollPaneFactory.createScrollPane(table), BorderLayout.CENTER); return panel; } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ProcessPopup.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ProcessPopup.java index 28eb442722fb..01c9f3172885 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ProcessPopup.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ProcessPopup.java @@ -169,7 +169,7 @@ public class ProcessPopup { myActiveFocusedContent.add(wrapper, BorderLayout.CENTER); - final JBScrollPane scrolls = new JBScrollPane(myActiveFocusedContent) { + final JScrollPane scrolls = new JBScrollPane(myActiveFocusedContent) { public Dimension getPreferredSize() { if (myProcessBox.getComponentCount() > 0) { return super.getPreferredSize(); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java index a8013d674485..a23ab8fb9e91 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java @@ -32,7 +32,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.LabeledIcon; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.UIBundle; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.EmptyIcon; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -266,13 +265,13 @@ public class WelcomeScreen { myMainPanel.add(quickStartPanel); myMainPanel.add(docsPanel); - JBScrollPane myMainScrollPane = new JBScrollPane(myMainPanel); + JScrollPane myMainScrollPane = ScrollPaneFactory.createScrollPane(myMainPanel); myMainScrollPane.setBorder(null); myMainScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); myMainScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); // Create Plugins Panel - JBScrollPane myPluginsScrollPane = createPluginsPanel(); + JScrollPane myPluginsScrollPane = createPluginsPanel(); // Create Welcome panel gBC = new GridBagConstraints(0, 0, 2, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 0, 5), 0, 0); @@ -417,7 +416,7 @@ public class WelcomeScreen { gBC = new GridBagConstraints(0, 4, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0); myPluginsPanel.add(emptyPanel_1, gBC); - JBScrollPane myPluginsScrollPane = ScrollPaneFactory.createScrollPane(myPluginsPanel); + JScrollPane myPluginsScrollPane = ScrollPaneFactory.createScrollPane(myPluginsPanel); myPluginsScrollPane.setBorder(BorderFactory.createLineBorder(GRAY_BORDER_COLOR)); myPluginsScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); myPluginsScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); diff --git a/platform/platform-impl/src/com/intellij/platform/FilesystemToolwindow.java b/platform/platform-impl/src/com/intellij/platform/FilesystemToolwindow.java index e0a89ddca3e6..c7100dc9f83c 100644 --- a/platform/platform-impl/src/com/intellij/platform/FilesystemToolwindow.java +++ b/platform/platform-impl/src/com/intellij/platform/FilesystemToolwindow.java @@ -30,7 +30,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowAnchor; import com.intellij.openapi.wm.ToolWindowManager; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentFactory; import com.intellij.ui.content.ContentFactoryImpl; @@ -60,7 +60,7 @@ public class FilesystemToolwindow { descriptor.addRoot(myRoot); myFsTree = new FileSystemTreeImpl(project, descriptor); - myContent.add(new JBScrollPane(myFsTree.getTree()), BorderLayout.CENTER); + myContent.add(ScrollPaneFactory.createScrollPane(myFsTree.getTree()), BorderLayout.CENTER); EditSourceOnDoubleClickHandler.install(myFsTree.getTree()); EditSourceOnEnterKeyHandler.install(myFsTree.getTree()); diff --git a/platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java b/platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java index 168c4a1a2e2b..387ebc177d0e 100644 --- a/platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java +++ b/platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java @@ -382,7 +382,7 @@ public abstract class MultilineTreeCellRenderer extends JComponent implements Tr public static JScrollPane installRenderer(final JTree tree, final MultilineTreeCellRenderer renderer) { final TreeCellRenderer defaultRenderer = tree.getCellRenderer(); - JBScrollPane scrollpane = new JBScrollPane(tree){ + JScrollPane scrollpane = new JBScrollPane(tree){ private int myAddRemoveCounter = 0; private boolean myShouldResetCaches = false; public void setSize(Dimension d) { diff --git a/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegBorders.java b/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegBorders.java index e4e695bb4243..b97a90e841e9 100644 --- a/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegBorders.java +++ b/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegBorders.java @@ -15,7 +15,7 @@ */ package com.intellij.ui.plaf.beg; -import com.intellij.ui.components.JBScrollPane; + import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -114,7 +114,7 @@ public class BegBorders { public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { - JBScrollPane scroll = (JBScrollPane) c; + JScrollPane scroll = (JScrollPane) c; JComponent colHeader = scroll.getColumnHeader(); int colHeaderHeight = 0; if (colHeader != null) diff --git a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java index 1a9328d2127a..c4615849c3b1 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java @@ -25,7 +25,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Pair; import com.intellij.ui.PopupBorder; import com.intellij.ui.ScreenUtil; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.popup.list.ListPopupImpl; import com.intellij.ui.popup.tree.TreePopupImpl; import com.intellij.ui.popup.util.MnemonicsSearch; @@ -76,7 +76,7 @@ public abstract class WizardPopup extends AbstractPopup implements ActionListene final JComponent content = createContent(); - JBScrollPane scrollPane = new JBScrollPane(content); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(content); scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.getHorizontalScrollBar().setBorder(null); @@ -290,7 +290,7 @@ public abstract class WizardPopup extends AbstractPopup implements ActionListene int resultHeight = ofContent.height > MAX_SIZE.height ? MAX_SIZE.height : ofContent.height; if (ofContent.height > MAX_SIZE.height) { - resultWidth += new JBScrollPane().getVerticalScrollBar().getPreferredSize().getWidth(); + resultWidth += ScrollPaneFactory.createScrollPane().getVerticalScrollBar().getPreferredSize().getWidth(); } return new Dimension(resultWidth, resultHeight); diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java index 84b2a3ea7d93..785e87ebf96f 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java @@ -27,7 +27,6 @@ import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.Disposer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SideBorder; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.AwtVisitor; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; @@ -41,7 +40,7 @@ import java.beans.PropertyChangeListener; * @author yole */ public abstract class TestResultsPanel extends JPanel implements Disposable { - private JBScrollPane myLeftPane; + private JScrollPane myLeftPane; private JComponent myStatisticsComponent; private Splitter mySplitter; protected final JComponent myConsole; @@ -93,15 +92,15 @@ public abstract class TestResultsPanel extends JPanel implements Disposable { mySplitter = new Splitter(); new AwtVisitor(myConsole) { public boolean visit(Component component) { - if (component instanceof JBScrollPane) { - ((JBScrollPane) component).putClientProperty(UIUtil.KEEP_BORDER_SIDES, SideBorder.TOP | SideBorder.LEFT); + if (component instanceof JScrollPane) { + ((JScrollPane) component).putClientProperty(UIUtil.KEEP_BORDER_SIDES, SideBorder.TOP | SideBorder.LEFT); return true; } return false; } }; mySplitter.setFirstComponent(createOutputTab(myConsole, myConsoleActions)); - final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myStatisticsComponent); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myStatisticsComponent); if (TestConsoleProperties.SHOW_STATISTICS.value(myProperties)) { mySplitter.setSecondComponent(scrollPane); } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/platform/vcs-api/src/com/intellij/openapi/vcs/ui/CommitMessage.java index e73b495eec1c..6d80bfc24bff 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/ui/CommitMessage.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/ui/CommitMessage.java @@ -22,9 +22,9 @@ import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.ActionToolbar; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.vcs.VcsBundle; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SeparatorFactory; import com.intellij.ui.TextComponentUndoProvider; -import com.intellij.ui.components.JBScrollPane; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -36,7 +36,7 @@ public class CommitMessage extends JPanel implements Disposable { public CommitMessage() { super(new BorderLayout()); - final JBScrollPane scrollPane = new JBScrollPane(myCommentArea); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myCommentArea); scrollPane.setPreferredSize(myCommentArea.getPreferredSize()); add(scrollPane, BorderLayout.CENTER); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java index 9623296b6d28..d89644cb1f44 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java @@ -28,9 +28,9 @@ import com.intellij.openapi.vcs.diff.DiffProvider; import com.intellij.openapi.vcs.history.*; import com.intellij.openapi.vcs.impl.VcsBackgroundableActions; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SpeedSearchBase; import com.intellij.ui.TableUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.dualView.TreeTableView; import com.intellij.ui.table.TableView; import com.intellij.ui.treeStructure.treetable.ListTreeTableModelOnColumns; @@ -193,7 +193,7 @@ public class CompareWithSelectedRevisionAction extends AbstractVcsAction { } } }); - final JBScrollPane textScrollPane = new JBScrollPane(textArea); + final JScrollPane textScrollPane = ScrollPaneFactory.createScrollPane(textArea); panel.add(textScrollPane, BorderLayout.CENTER); textScrollPane.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.lightGray),VcsBundle.message("border.selected.revision.commit.message"))); return panel; @@ -285,7 +285,7 @@ public class CompareWithSelectedRevisionAction extends AbstractVcsAction { }); JPanel jPanel = new JPanel(new BorderLayout()); - final JBScrollPane textScrollPane = new JBScrollPane(textArea); + final JScrollPane textScrollPane = ScrollPaneFactory.createScrollPane(textArea); textScrollPane.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.lightGray),VcsBundle.message("border.selected.revision.commit.message"))); jPanel.add(textScrollPane, BorderLayout.SOUTH); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java index 57cb372e42ab..647a7d6bc2fa 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java @@ -41,7 +41,7 @@ import com.intellij.openapi.vcs.changes.actions.IgnoredSettingsAction; import com.intellij.openapi.vcs.changes.ui.ChangesListView; import com.intellij.openapi.vcs.changes.ui.ChangesViewContentManager; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentFactory; import com.intellij.util.Alarm; @@ -183,7 +183,7 @@ public class ChangesViewManager extends AbstractProjectComponent implements JDOM panel.setToolbar(toolbarPanel); final JPanel content = new JPanel(new BorderLayout()); - content.add(new JBScrollPane(myView), BorderLayout.CENTER); + content.add(ScrollPaneFactory.createScrollPane(myView), BorderLayout.CENTER); content.add(myProgressLabel, BorderLayout.SOUTH); panel.setContent(content); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java index f16816930b09..aa14278d7624 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java @@ -34,7 +34,7 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNodeRenderer; import com.intellij.openapi.vcs.changes.ui.ChangesListView; import com.intellij.openapi.vcs.changes.ui.TreeModelBuilder; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.EditSourceOnEnterKeyHandler; import com.intellij.util.Icons; @@ -132,7 +132,7 @@ public class UnversionedViewDialog extends DialogWrapper { } final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar("UNVERSIONED_DIALOG", group, false); myPanel.add(actionToolbar.getComponent(), BorderLayout.WEST); - myPanel.add(new JBScrollPane(myView), BorderLayout.CENTER); + myPanel.add(ScrollPaneFactory.createScrollPane(myView), BorderLayout.CENTER); final DeleteUnversionedFilesAction deleteUnversionedFilesAction = new DeleteUnversionedFilesAction() { @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangeListDetailsAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangeListDetailsAction.java index a5af63b1f52d..fcc0717dd848 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangeListDetailsAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangeListDetailsAction.java @@ -29,7 +29,7 @@ import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.ChangeList; import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkHtmlRenderer; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.UIUtil; import com.intellij.xml.util.XmlStringUtil; import org.jetbrains.annotations.NonNls; @@ -108,7 +108,7 @@ public class ChangeListDetailsAction extends AnAction implements DumbAware { } } }); - JBScrollPane scrollPane = new JBScrollPane(editorPane); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(editorPane); final JBPopup hint = JBPopupFactory.getInstance().createComponentPopupBuilder(scrollPane, editorPane) .setDimensionServiceKey(project, "changelist.details.popup", false) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java index 95151103e638..fa99872d247e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java @@ -23,7 +23,6 @@ import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Convertor; @@ -42,7 +41,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * @author yole */ public class ColumnFilteringStrategy implements ChangeListFilteringStrategy { - private final JBScrollPane myScrollPane; + private final JScrollPane myScrollPane; private final JList myValueList; private final CopyOnWriteArrayList myListeners = ContainerUtil.createEmptyCOWList(); private final ChangeListColumn myColumn; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java index f3a1992b116c..3ca8ba8ce82b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java @@ -29,11 +29,7 @@ import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkHtmlRenderer; import com.intellij.openapi.vcs.changes.ui.ChangesBrowser; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; -import com.intellij.ui.BrowserHyperlinkListener; -import com.intellij.ui.PopupHandler; -import com.intellij.ui.SeparatorFactory; -import com.intellij.ui.TableUtil; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.*; import com.intellij.ui.table.TableView; import com.intellij.util.ui.SortableColumnModel; import com.intellij.util.ui.UIUtil; @@ -87,7 +83,7 @@ public class CommittedChangesBrowser extends JPanel { myCommitMessageArea.setEditable(false); JPanel commitPanel = new JPanel(new BorderLayout()); - commitPanel.add(new JBScrollPane(myCommitMessageArea), BorderLayout.CENTER); + commitPanel.add(ScrollPaneFactory.createScrollPane(myCommitMessageArea), BorderLayout.CENTER); final JComponent separator = SeparatorFactory.createSeparator(VcsBundle.message("label.commit.comment"), myCommitMessageArea); commitPanel.add(separator, BorderLayout.NORTH); @@ -115,7 +111,7 @@ public class CommittedChangesBrowser extends JPanel { ++ innerGb.gridy; innerGb.weighty = 1; innerGb.fill = GridBagConstraints.BOTH; - listContainer.add(new JBScrollPane(myChangeListsView), innerGb); + listContainer.add(ScrollPaneFactory.createScrollPane(myChangeListsView), innerGb); final GridBagConstraints gb = new GridBagConstraints(0, 0, 1, 1, 1, 1, GridBagConstraints.NORTH, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java index 7615f89fa625..7736c41b7f12 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java @@ -26,11 +26,7 @@ import com.intellij.openapi.vcs.changes.ContentRevision; import com.intellij.openapi.vcs.changes.issueLinks.TreeLinkMouseListener; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.pom.Navigatable; -import com.intellij.ui.IdeBorderFactory; -import com.intellij.ui.PopupHandler; -import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.TreeCopyProvider; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.*; import com.intellij.ui.treeStructure.Tree; import com.intellij.ui.treeStructure.actions.CollapseAllAction; import com.intellij.ui.treeStructure.actions.ExpandAllAction; @@ -114,7 +110,7 @@ public class CommittedChangesTreeBrowser extends JPanel implements TypeSafeDataP final Splitter filterSplitter = new Splitter(false, 0.5f); - filterSplitter.setSecondComponent(new JBScrollPane(myChangesTree)); + filterSplitter.setSecondComponent(ScrollPaneFactory.createScrollPane(myChangesTree)); myLeftPanel.add(filterSplitter, BorderLayout.CENTER); final Splitter mainSplitter = new Splitter(false, 0.7f); mainSplitter.setFirstComponent(myLeftPanel); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/StructureFilteringStrategy.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/StructureFilteringStrategy.java index eb7909e6b270..ac735263afcd 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/StructureFilteringStrategy.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/StructureFilteringStrategy.java @@ -25,7 +25,7 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNode; import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNodeRenderer; import com.intellij.openapi.vcs.changes.ui.TreeModelBuilder; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -138,7 +138,7 @@ public class StructureFilteringStrategy implements ChangeListFilteringStrategy { } } }); - myScrollPane = new JBScrollPane(myStructureTree); + myScrollPane = ScrollPaneFactory.createScrollPane(myStructureTree); myBuilder = new TreeModelBuilder(myProject, false); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/WiseSplitter.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/WiseSplitter.java index c46c4bb46f79..b9b6bd8e11de 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/WiseSplitter.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/WiseSplitter.java @@ -18,7 +18,6 @@ package com.intellij.openapi.vcs.changes.committed; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.ui.ThreeComponentsSplitter; import com.intellij.ui.IdeBorderFactory; -import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import javax.swing.border.Border; @@ -87,7 +86,7 @@ public class WiseSplitter { } private void setBorder(JComponent c, boolean leftMost) { - if (c instanceof JBScrollPane) c.setBorder(leftMost ? LEFT_BORDER : MIDDLE_BORDER); + if (c instanceof JScrollPane) c.setBorder(leftMost ? LEFT_BORDER : MIDDLE_BORDER); } public void remove(final String key) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java index 47ee76aa65da..51cc15f71306 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java @@ -44,11 +44,7 @@ import com.intellij.openapi.vcs.changes.patch.RelativePathCalculator; import com.intellij.openapi.vcs.changes.ui.ChangesViewContentManager; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; -import com.intellij.ui.ColoredTreeCellRenderer; -import com.intellij.ui.PopupHandler; -import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.*; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentFactory; import com.intellij.ui.treeStructure.Tree; @@ -181,7 +177,7 @@ public class ShelvedChangesViewManager implements ProjectComponent { } else { if (myContent == null) { - JBScrollPane scrollPane = new JBScrollPane(myTree); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); scrollPane.setBorder(null); myContent = ContentFactory.SERVICE.getInstance().createContent(scrollPane, VcsBundle.message("shelf.tab"), false); myContent.setCloseable(false); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java index 28dfc213369f..7e4a12be6d3e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java @@ -36,8 +36,8 @@ import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkHtmlRenderer; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeListImpl; import com.intellij.ui.BrowserHyperlinkListener; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SeparatorFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.NotNullFunction; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -61,7 +61,7 @@ public class ChangeListViewerDialog extends DialogWrapper implements DataProvide private final boolean myInAir; private Change[] myChanges; private NotNullFunction myConvertor; - private JBScrollPane commitMessageScroll; + private JScrollPane commitMessageScroll; public ChangeListViewerDialog(Project project, CommittedChangeList changeList) { super(project, true); @@ -101,7 +101,7 @@ public class ChangeListViewerDialog extends DialogWrapper implements DataProvide @NonNls final String text = IssueLinkHtmlRenderer.formatTextIntoHtml(project, changeList.getComment().trim()); myCommitMessageArea.setBackground(UIUtil.getComboBoxDisabledBackground()); myCommitMessageArea.addHyperlinkListener(new BrowserHyperlinkListener()); - commitMessageScroll = new JBScrollPane(myCommitMessageArea); + commitMessageScroll = ScrollPaneFactory.createScrollPane(myCommitMessageArea); myCommitMessageArea.setText(text); myCommitMessageArea.setCaretPosition(0); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesListView.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesListView.java index 1a622342a57d..dc0c545f97cb 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesListView.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesListView.java @@ -37,7 +37,6 @@ import com.intellij.ui.TreeCopyProvider; import com.intellij.ui.TreeSpeedSearch; import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.awt.RelativeRectangle; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.EditSourceOnEnterKeyHandler; @@ -540,7 +539,7 @@ public class ChangesListView extends Tree implements TypeSafeDataProvider, Advan final Container container = getParent(); if (container instanceof JViewport) { final Container scrollPane = container.getParent(); - if (scrollPane instanceof JBScrollPane) { + if (scrollPane instanceof JScrollPane) { final Rectangle rectangle = SwingUtilities.convertRectangle(this, rect, scrollPane.getParent()); return scrollPane.getBounds().contains(rectangle); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java index afae1f16f06c..50e0febdf6bb 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java @@ -35,7 +35,6 @@ import com.intellij.openapi.vcs.changes.ChangesUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.*; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.ui.treeStructure.actions.CollapseAllAction; import com.intellij.ui.treeStructure.actions.ExpandAllAction; @@ -61,8 +60,8 @@ import java.util.List; public abstract class ChangesTreeList extends JPanel { private final Tree myTree; private final JBList myList; - private final JBScrollPane myTreeScrollPane; - private final JBScrollPane myListScrollPane; + private final JScrollPane myTreeScrollPane; + private final JScrollPane myListScrollPane; protected final Project myProject; private final boolean myShowCheckboxes; private final boolean myHighlightProblems; @@ -136,8 +135,8 @@ public abstract class ChangesTreeList extends JPanel { myList = new JBList(new DefaultListModel()); myList.setVisibleRowCount(10); - add(myListScrollPane = new JBScrollPane(myList), LIST_CARD); - add(myTreeScrollPane = new JBScrollPane(myTree), TREE_CARD); + add(myListScrollPane = ScrollPaneFactory.createScrollPane(myList), LIST_CARD); + add(myTreeScrollPane = ScrollPaneFactory.createScrollPane(myTree), TREE_CARD); new ListSpeedSearch(myList) { protected String getElementText(Object element) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index d0a68c6ebf66..fde9194fba42 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -39,8 +39,8 @@ import com.intellij.openapi.vcs.ui.CommitMessage; import com.intellij.openapi.vcs.ui.RefreshableOnComponent; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.IdeBorderFactory; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SeparatorFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Alarm; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -977,8 +977,8 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj super(new BorderLayout()); myArea.setText(dialog.getCommitMessage()); myArea.setLineWrap(true); - myArea.setWrapStyleWord(true); - JBScrollPane scrollPane = new JBScrollPane(myArea); + myArea.setWrapStyleWord(true); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myArea); setBorder(IdeBorderFactory.createTitledBorder(VcsBundle.message("diff.commit.message.title"))); add(scrollPane, BorderLayout.CENTER); myCommitDialog = dialog; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsConfigurationsDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsConfigurationsDialog.java index afbf65eceb6d..eda6ef43678f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsConfigurationsDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsConfigurationsDialog.java @@ -25,7 +25,6 @@ import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -49,7 +48,7 @@ public class VcsConfigurationsDialog extends DialogWrapper{ append(name, new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, list.getForeground())); } }; - private JBScrollPane myVcsesScrollPane; + private JScrollPane myVcsesScrollPane; @Nullable private final JComboBox myVcsesToUpdate; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java index ec6296c09afc..eea1fc376f48 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java @@ -26,7 +26,6 @@ import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsDirectoryMapping; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.table.TableView; import com.intellij.util.ui.AbstractTableCellEditor; import com.intellij.util.ui.ColumnInfo; @@ -262,7 +261,7 @@ public class VcsDirectoryConfigurationPanel extends PanelWithButtons implements } protected JComponent createMainComponent() { - return new JBScrollPane(myDirectoryMappingTable); + return ScrollPaneFactory.createScrollPane(myDirectoryMappingTable); } public void reset() { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java index aa85734a6566..cc06dee9802b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java @@ -61,7 +61,6 @@ import com.intellij.openapi.vcs.vfs.VcsVirtualFile; import com.intellij.openapi.vfs.ReadonlyStatusHandler; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.content.ContentManager; import com.intellij.ui.dualView.CellWrapper; import com.intellij.ui.dualView.DualTreeElement; @@ -651,7 +650,7 @@ public class FileHistoryPanelImplemptyList(), Collections.emptyList(), null); myRepositoryChangesBrowser.getDiffAction().registerCustomShortcutSet(CommonShortcuts.getDiff(), myCommitsList); @@ -1099,7 +1096,7 @@ public class GitLogTree implements GitTreeViewI { titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD)); myPanel.add(titleLabel, BorderLayout.NORTH); - myPanel.add(new JBScrollPane(myTree), BorderLayout.CENTER); + myPanel.add(ScrollPaneFactory.createScrollPane(myTree), BorderLayout.CENTER); //tree.set } diff --git a/plugins/git4idea/src/git4idea/history/browser/GitLogTreeFileSelector.java b/plugins/git4idea/src/git4idea/history/browser/GitLogTreeFileSelector.java index a190bcb05617..57d198b7a5db 100644 --- a/plugins/git4idea/src/git4idea/history/browser/GitLogTreeFileSelector.java +++ b/plugins/git4idea/src/git4idea/history/browser/GitLogTreeFileSelector.java @@ -21,7 +21,7 @@ import com.intellij.openapi.fileChooser.FileSystemTreeFactory; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import javax.swing.*; import java.awt.*; @@ -61,7 +61,7 @@ public class GitLogTreeFileSelector extends DialogWrapper { tree.setCellRenderer(new GitLogTreeFileSelectorRenderer(myProject)); myFileSystemTree.select(myRoot, null); - myPanel.add(new JBScrollPane(tree), BorderLayout.CENTER); + myPanel.add(ScrollPaneFactory.createScrollPane(tree), BorderLayout.CENTER); } @Override diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java index 779a572b4f52..510532a89202 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicToolWindowWrapper.java @@ -34,7 +34,6 @@ import com.intellij.refactoring.listeners.RefactoringElementListener; import com.intellij.refactoring.listeners.RefactoringElementListenerProvider; import com.intellij.refactoring.listeners.RefactoringListenerManager; import com.intellij.ui.*; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentManager; import com.intellij.ui.treeStructure.treetable.ListTreeTableModelOnColumns; @@ -158,7 +157,7 @@ public class DynamicToolWindowWrapper { myTreeTablePanel.removeAll(); - final JBScrollPane treeTable = createTable(root); + final JScrollPane treeTable = createTable(root); if (expandAll) { TreeUtil.expandAll(myTreeTable.getTree()); @@ -373,7 +372,7 @@ public class DynamicToolWindowWrapper { myTreeTable.getColumn(myColumnNames[CLASS_OR_ELEMENT_NAME_COLUMN]).setPreferredWidth(200); myTreeTable.getColumn(myColumnNames[TYPE_COLUMN]).setPreferredWidth(160); - JBScrollPane scrollpane = ScrollPaneFactory.createScrollPane(myTreeTable); + JScrollPane scrollpane = ScrollPaneFactory.createScrollPane(myTreeTable); scrollpane.setPreferredSize(new Dimension(600, 400)); return scrollpane; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java index 86bf0ad21f89..656d33b94215 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java @@ -25,7 +25,6 @@ import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.NonFocusableCheckBox; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.doc.actions.GroovyDocAddPackageAction; @@ -69,7 +68,7 @@ public final class GroovyDocGenerationPanel extends JPanel { myPackagesList = new JBList(myDataModel); myPackagesList.setMinimumSize(new Dimension(100, 150)); - JBScrollPane packagesScrollPane = ScrollPaneFactory.createScrollPane(myPackagesList); + JScrollPane packagesScrollPane = ScrollPaneFactory.createScrollPane(myPackagesList); myPackagesPanel.setLayout(new BorderLayout()); myPackagesPanel.setBorder(IdeBorderFactory.createTitledBorder("Source packages")); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/ui/GradleSetupPanel.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/ui/GradleSetupPanel.java index f23b711a9cfd..afc2c5f3b4d2 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/ui/GradleSetupPanel.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/ui/GradleSetupPanel.java @@ -15,7 +15,7 @@ */ package org.jetbrains.plugins.groovy.gradle.ui; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import javax.swing.*; import java.awt.*; @@ -101,7 +101,7 @@ public class GradleSetupPanel detailsTextArea.setText( message + "\n" + messageDetails ); detailsTextArea.setCaretPosition( 0 ); //put the caret at the front. - JBScrollPane scrollPane = new JBScrollPane( detailsTextArea ); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(detailsTextArea); scrollPane.setPreferredSize( new Dimension( 400, 500 ) ); JOptionPane.showMessageDialog( mainPanel, scrollPane ); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extractMethod/ParameterTablePanel.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extractMethod/ParameterTablePanel.java index 367fc4ef1c4b..f3d3739c486e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extractMethod/ParameterTablePanel.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extractMethod/ParameterTablePanel.java @@ -25,7 +25,6 @@ import com.intellij.refactoring.ui.TypeSelector; import com.intellij.ui.BooleanTableCellRenderer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TableUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.AbstractTableCellEditor; import com.intellij.util.ui.Table; import org.jetbrains.annotations.NonNls; @@ -217,7 +216,7 @@ public class ParameterTablePanel extends JPanel { }); JPanel listPanel = new JPanel(new BorderLayout()); - JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); listPanel.add(scrollPane, BorderLayout.CENTER); listPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); add(listPanel, BorderLayout.CENTER); diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java index a022cf0fb2e4..860331cf48f2 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java @@ -14,7 +14,7 @@ package org.zmlx.hg4idea.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; import org.apache.commons.lang.StringUtils; @@ -63,7 +63,7 @@ public class HgGlobalStatusDialog extends DialogWrapper { private void $$$setupUI$$$() { contentPanel = new JPanel(); contentPanel.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1)); - final JBScrollPane scrollPane1 = new JBScrollPane(); + final JScrollPane scrollPane1 = ScrollPaneFactory.createScrollPane(); contentPanel.add(scrollPane1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, new Dimension(300, 350), null, null, 0, false)); outputTextArea = new JTextArea(); outputTextArea.setEditable(false); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java index cf7be8c2cc70..6ec7d19640e2 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java @@ -18,9 +18,9 @@ package org.jetbrains.idea.maven.indices; import com.intellij.openapi.Disposable; import com.intellij.openapi.project.Project; import com.intellij.ui.DocumentAdapter; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.ui.UIUtil; @@ -73,7 +73,7 @@ public class MavenArtifactSearchPanel extends JPanel { setLayout(new BorderLayout()); add(mySearchField, BorderLayout.NORTH); - add(new JBScrollPane(myResultList), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(myResultList), BorderLayout.CENTER); mySearchField.getDocument().addDocumentListener(new DocumentAdapter() { protected void textChanged(DocumentEvent e) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java index ffb7d3535c58..e1107825be51 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java @@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; import com.intellij.ui.PopupHandler; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.treeStructure.SimpleTree; import gnu.trove.THashMap; import gnu.trove.THashSet; @@ -65,7 +65,7 @@ public class MavenProjectsNavigatorPanel extends SimpleToolWindowPanel implement actionToolbar.setTargetComponent(tree); setToolbar(actionToolbar.getComponent()); - setContent(new JBScrollPane(myTree)); + setContent(ScrollPaneFactory.createScrollPane(myTree)); myTree.addMouseListener(new PopupHandler() { public void invokePopup(final Component comp, final int x, final int y) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenProjectsDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenProjectsDialog.java index 1532a37b7bdb..455ccacf53f4 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenProjectsDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenProjectsDialog.java @@ -17,7 +17,7 @@ package org.jetbrains.idea.maven.navigator; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.treeStructure.SimpleNode; import com.intellij.ui.treeStructure.SimpleNodeVisitor; import com.intellij.ui.treeStructure.SimpleTree; @@ -91,7 +91,7 @@ public class SelectFromMavenProjectsDialog extends DialogWrapper { @Nullable protected JComponent createCenterPanel() { - final JBScrollPane pane = new JBScrollPane(myTree); + final JScrollPane pane = ScrollPaneFactory.createScrollPane(myTree); pane.setPreferredSize(new Dimension(320, 400)); return pane; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/ChooserDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/ChooserDialog.java index 896c9ede2285..389609679aa2 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/ChooserDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/ChooserDialog.java @@ -18,7 +18,7 @@ package org.jetbrains.idea.maven.utils; import com.intellij.ide.util.ElementsChooser; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -44,7 +44,7 @@ public class ChooserDialog extends DialogWrapper { @Nullable protected JComponent createCenterPanel() { - return new JBScrollPane(myChooser); + return ScrollPaneFactory.createScrollPane(myChooser); } protected JComponent createNorthPanel() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.java index ae45ff8395f2..ef6b248fb29a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.java @@ -21,11 +21,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.ui.ColoredTreeCellRenderer; -import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.SpeedSearchBase; -import com.intellij.ui.TreeSpeedSearch; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.*; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.containers.Convertor; import com.intellij.util.ui.AbstractLayoutManager; @@ -86,10 +82,10 @@ public class MavenModuleWizardStep extends ModuleWizardStep { private JCheckBox myUseArchetypeCheckBox; private JButton myAddArchetypeButton; - private JBScrollPane myArchetypesScrollPane; + private JScrollPane myArchetypesScrollPane; private JPanel myArchetypesPanel; private Tree myArchetypesTree; - private JBScrollPane myArchetypeDescriptionScrollPane; + private JScrollPane myArchetypeDescriptionScrollPane; private JTextArea myArchetypeDescriptionField; private AtomicBoolean myLoadingCancelled = new AtomicBoolean(); @@ -106,7 +102,7 @@ public class MavenModuleWizardStep extends ModuleWizardStep { private void initComponents() { myArchetypesTree = new Tree(); myArchetypesTree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode())); - myArchetypesScrollPane = new JBScrollPane(myArchetypesTree); + myArchetypesScrollPane = ScrollPaneFactory.createScrollPane(myArchetypesTree); myLoadingIcon.setVisible(false); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java index 88e5db0d977e..32b6a379f4a8 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java @@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.ui.DottedBorder; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.labels.LinkLabel; import com.intellij.ui.components.labels.LinkListener; import com.intellij.util.containers.Convertor; @@ -119,7 +119,7 @@ public class CopiesPanel { } } }); - myHolder = new JBScrollPane(holderPanel); + myHolder = ScrollPaneFactory.createScrollPane(holderPanel); setFocusableForLinks(myRefreshLabel); refreshView.run(); initView(); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java index 2152013d3b11..b7a980500a5c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java @@ -17,7 +17,7 @@ package org.jetbrains.idea.svn.dialogs; import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.OptionsDialog; import org.jetbrains.annotations.NonNls; import org.jetbrains.idea.svn.SvnBundle; @@ -88,8 +88,8 @@ public class LockDialog extends OptionsDialog { gc.fill = GridBagConstraints.BOTH; myLockTextArea = new JTextArea(7, 25); - JBScrollPane scrollPane = new JBScrollPane(myLockTextArea, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + JScrollPane scrollPane = + ScrollPaneFactory.createScrollPane(myLockTextArea, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); scrollPane.setMinimumSize(scrollPane.getPreferredSize()); panel.add(scrollPane, gc); commentLabel.setLabelFor(myLockTextArea); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java index d72dfb979aee..68fabbcc9434 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java @@ -17,7 +17,7 @@ package org.jetbrains.idea.svn.dialogs; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.util.IconLoader; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import javax.swing.*; import java.awt.*; @@ -43,7 +43,9 @@ public class PagedListWithActions { myComponentManager.setData(myEngine.getCurrent()); //myList.setListData(ArrayUtil.toObjectArray(myEngine.getCurrent())); myPanel.add(ActionManager.getInstance().createActionToolbar("merge all", createListActions(), true).getComponent(), BorderLayout.NORTH); - final JBScrollPane scroll = new JBScrollPane(myComponentManager.getComponent(), JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + final JScrollPane scroll = ScrollPaneFactory + .createScrollPane(myComponentManager.getComponent(), JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); myPanel.add(scroll, BorderLayout.CENTER); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java index 9ed8cd1b555d..5097c8b8cdad 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java @@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.ui.PopupHandler; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.table.JBTable; import com.intellij.util.containers.HashMap; import org.jetbrains.idea.svn.SvnVcs; @@ -77,8 +77,8 @@ public class PropertiesComponent extends JPanel { myTable = new JBTable(); myTextArea = new JTextArea(0, 0); myTextArea.setEditable(false); - JBScrollPane scrollPane = new JBScrollPane(myTable); - mySplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true, scrollPane, new JBScrollPane(myTextArea)); + JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + mySplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true, scrollPane, ScrollPaneFactory.createScrollPane(myTextArea)); add(mySplitPane, BorderLayout.CENTER); add(createToolbar(), BorderLayout.WEST); final DefaultTableModel model = new DefaultTableModel(createTableModel(new HashMap()), new Object[]{"Name", "Value"}) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java index 91bf5b86d3f3..1275ac52f755 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java @@ -25,7 +25,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.vcs.vfs.VcsFileSystem; import com.intellij.openapi.vcs.vfs.VcsVirtualFile; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.NotNullFunction; @@ -193,8 +193,8 @@ public class RepositoryBrowserComponent extends JPanel implements Disposable, Da myRepositoryTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); myRepositoryTree.setRootVisible(false); myRepositoryTree.setShowsRootHandles(true); - JBScrollPane scrollPane = new JBScrollPane(myRepositoryTree, - JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); + JScrollPane scrollPane = + ScrollPaneFactory.createScrollPane(myRepositoryTree, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); add(scrollPane, BorderLayout.CENTER); myRepositoryTree.setCellRenderer(new SvnRepositoryTreeCellRenderer()); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java index 803136fab41b..66a82cd943cd 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.OrderPanel; import com.intellij.ui.OrderPanelListener; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.idea.svn.SvnBundle; @@ -116,7 +116,7 @@ public class SelectFilesDialog extends DialogWrapper implements ActionListener { FontMetrics fm = myFilesList.getFontMetrics(font); int height = fm.getHeight(); myFilesList.setPreferredSize(new Dimension(myFilesList.getPreferredSize().width, height*7)); - panel.add(new JBScrollPane(myFilesList), BorderLayout.CENTER); + panel.add(ScrollPaneFactory.createScrollPane(myFilesList), BorderLayout.CENTER); JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); mySelectAllButton = new JButton(SvnBundle.message("button.text.select.all")); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java index b3c1c2c898d1..64a9e23c3916 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java @@ -17,7 +17,7 @@ package org.jetbrains.idea.svn.dialogs; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import org.jetbrains.annotations.NonNls; import org.jetbrains.idea.svn.SvnBundle; import org.tmatesoft.svn.core.auth.ISVNAuthenticationProvider; @@ -94,7 +94,7 @@ public class ServerSSLDialog extends DialogWrapper { JTextArea area = new JTextArea(5, 50); area.setText(getServerCertificateInfo(myCertificate)); area.setEditable(false); - panel.add(new JBScrollPane(area), BorderLayout.CENTER); + panel.add(ScrollPaneFactory.createScrollPane(area), BorderLayout.CENTER); return panel; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/DeleteOptionsDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/DeleteOptionsDialog.java index c5cb5f816849..845c501290db 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/DeleteOptionsDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/DeleteOptionsDialog.java @@ -18,7 +18,7 @@ package org.jetbrains.idea.svn.dialogs.browser; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.vcs.VcsConfiguration; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -79,7 +79,7 @@ public class DeleteOptionsDialog extends DialogWrapper { myCommitMessage = new JTextArea(10, 0); myCommitMessage.setWrapStyleWord(true); myCommitMessage.setLineWrap(true); - panel.add(new JBScrollPane(myCommitMessage), gc); + panel.add(ScrollPaneFactory.createScrollPane(myCommitMessage), gc); gc.gridy += 1; gc.gridwidth = 3; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/ImportOptionsDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/ImportOptionsDialog.java index 5c159960c6a0..502d470477eb 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/ImportOptionsDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/ImportOptionsDialog.java @@ -22,7 +22,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -152,7 +152,7 @@ public class ImportOptionsDialog extends DialogWrapper implements ActionListener myCommitMessage = new JTextArea(10, 0); myCommitMessage.setWrapStyleWord(true); myCommitMessage.setLineWrap(true); - panel.add(new JBScrollPane(myCommitMessage), gc); + panel.add(ScrollPaneFactory.createScrollPane(myCommitMessage), gc); gc.gridy += 1; gc.gridwidth = 3; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java index 3651be5e81fd..14ed5044357f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java @@ -32,7 +32,7 @@ import com.intellij.openapi.vcs.changes.committed.CommittedChangeListDecorator; import com.intellij.openapi.vcs.changes.committed.CommittedChangeListsListener; import com.intellij.openapi.vcs.changes.committed.DecoratorManager; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.Consumer; import com.intellij.util.NullableFunction; import com.intellij.util.messages.Topic; @@ -391,8 +391,8 @@ public class RootsAndBranches implements CommittedChangeListDecorator { final GridBagConstraints gb = new GridBagConstraints(0, 0, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0); myPanelWrapper.add(myPanel, gb); - return new JBScrollPane(myPanelWrapper, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + return ScrollPaneFactory + .createScrollPane(myPanelWrapper, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); } // todo refactor to get rid of duplicate code dealing with separators diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundAction.java index c20492b167f8..c8f5a2177b61 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundAction.java @@ -19,7 +19,6 @@ package com.intellij.uiDesigner.actions; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.FormEditingUtil; import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; @@ -186,7 +185,7 @@ public class SurroundAction extends AbstractGuiEditorAction { } private boolean canWrapSelection(final ArrayList selection) { - if (myComponentClass.equals(JBScrollPane.class.getName())) { + if (myComponentClass.equals(JScrollPane.class.getName())) { if (selection.size() > 1) return false; RadComponent component = selection.get(0); return component.getDelegee() instanceof Scrollable; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundActionGroup.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundActionGroup.java index 27e705ea3e7f..4483f06bc9ec 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundActionGroup.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundActionGroup.java @@ -19,7 +19,6 @@ package com.intellij.uiDesigner.actions; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.ui.components.JBScrollPane; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -33,7 +32,7 @@ public class SurroundActionGroup extends ActionGroup { public SurroundActionGroup() { myChildren = new AnAction[4]; myChildren [0] = new SurroundAction(JPanel.class.getName()); - myChildren [1] = new SurroundAction(JBScrollPane.class.getName()); + myChildren [1] = new SurroundAction(JScrollPane.class.getName()); myChildren [2] = new SurroundAction(JSplitPane.class.getName()); myChildren [3] = new SurroundAction(JTabbedPane.class.getName()); } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java index 321117fa07b4..2212e8e14b81 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java @@ -37,7 +37,7 @@ import com.intellij.openapi.util.Ref; import com.intellij.openapi.vfs.ReadonlyStatusHandler; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.uiDesigner.*; import com.intellij.uiDesigner.compiler.Utils; import com.intellij.uiDesigner.componentTree.ComponentPtr; @@ -301,7 +301,7 @@ public final class GuiEditor extends JPanel implements DataProvider { gbc.gridy = 1; gbc.weightx = 1.0; gbc.weighty = 1.0; - final JBScrollPane scrollPane = new JBScrollPane(myLayeredPane); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myLayeredPane); scrollPane.setBackground(Color.WHITE); panel.add(scrollPane, gbc); myHorzCaptionPanel.attachToScrollPane(scrollPane); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java index fabe095a338d..ff98c0511d9f 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java @@ -35,7 +35,6 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.*; import com.intellij.uiDesigner.compiler.Utils; import com.intellij.uiDesigner.core.Util; @@ -74,7 +73,7 @@ public final class InsertComponentProcessor extends EventProcessor { private static final Map myComponentClassMap = new HashMap(); static { - myComponentClassMap.put(JBScrollPane.class.getName(), new RadScrollPane.Factory()); + myComponentClassMap.put(JScrollPane.class.getName(), new RadScrollPane.Factory()); myComponentClassMap.put(JPanel.class.getName(), new RadContainer.Factory()); myComponentClassMap.put(VSpacer.class.getName(), new RadVSpacer.Factory()); myComponentClassMap.put(HSpacer.class.getName(), new RadHSpacer.Factory()); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoScrollPaneInspection.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoScrollPaneInspection.java index d72bf108f9d7..8c5b4e79b663 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoScrollPaneInspection.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoScrollPaneInspection.java @@ -17,7 +17,6 @@ package com.intellij.uiDesigner.inspections; import com.intellij.openapi.module.Module; -import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.actions.SurroundAction; import com.intellij.uiDesigner.designSurface.GuiEditor; @@ -46,7 +45,7 @@ public class NoScrollPaneInspection extends BaseFormInspection { protected void checkComponentProperties(Module module, IComponent component, FormErrorCollector collector) { if (FormInspectionUtil.isComponentClass(module, component, Scrollable.class) && !FormInspectionUtil.isComponentClass(module, component, JTextField.class) && - !FormInspectionUtil.isComponentClass(module, component.getParentContainer(), JBScrollPane.class)) { + !FormInspectionUtil.isComponentClass(module, component.getParentContainer(), JScrollPane.class)) { collector.addError(getID(), component, null, UIDesignerBundle.message("inspection.no.scroll.pane"), new EditorQuickFixProvider() { public QuickFix createQuickFix(GuiEditor editor, RadComponent component) { @@ -64,7 +63,7 @@ public class NoScrollPaneInspection extends BaseFormInspection { public void run() { ArrayList targetList = new ArrayList(Collections.singletonList(myComponent)); - new SurroundAction(JBScrollPane.class.getName()).actionPerformed(myEditor, targetList, null); + new SurroundAction(JScrollPane.class.getName()).actionPerformed(myEditor, targetList, null); } } } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspector.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspector.java index 0db124b744fb..b9077c5cc048 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspector.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspector.java @@ -19,7 +19,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ex.MultiLineLabel; import com.intellij.openapi.util.Comparing; import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.componentTree.ComponentSelectionListener; import com.intellij.uiDesigner.componentTree.ComponentTree; @@ -52,7 +51,7 @@ public final class PropertyInspector extends JPanel{ @NonNls private static final String INSPECTOR_CARD = "inspector"; @NonNls private static final String EMPTY_CARD = "empty"; @NonNls private static final String CUSTOM_CARD = "column"; - private final JBScrollPane myCustomPropertiesScrollPane = new JBScrollPane(); + private final JScrollPane myCustomPropertiesScrollPane = ScrollPaneFactory.createScrollPane(); private CustomPropertiesPanel myCustomPropertiesPanel; private final ChangeListener myCustomPropertiesChangeListener; private RadContainer myPropertiesPanelContainer; @@ -65,7 +64,7 @@ public final class PropertyInspector extends JPanel{ // Card with property inspector final JPanel inspectorCard = new JPanel(new GridBagLayout()); - final JBScrollPane inspectorScrollPane = ScrollPaneFactory.createScrollPane(myInspectorTable); + final JScrollPane inspectorScrollPane = ScrollPaneFactory.createScrollPane(myInspectorTable); inspectorCard.add(inspectorScrollPane, new GridBagConstraints(0, 0, 0, 1, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0) ); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java index 3755c9c55d28..d48c3bb39441 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java @@ -31,7 +31,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowAnchor; import com.intellij.openapi.wm.ToolWindowManager; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.componentTree.ComponentTree; import com.intellij.uiDesigner.componentTree.ComponentTreeBuilder; @@ -43,6 +43,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import javax.swing.*; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; @@ -93,7 +94,7 @@ public class UIDesignerToolWindowManager implements ProjectComponent { myComponentTree.addTreeSelectionListener(listener); } myPendingListeners.clear(); - final JBScrollPane scrollPane = new JBScrollPane(myComponentTree); + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myComponentTree); scrollPane.setPreferredSize(new Dimension(250, -1)); myComponentTree.initQuickFixManager(scrollPane.getViewport()); myPropertyInspector= new PropertyInspector(myProject, myComponentTree); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ColorEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ColorEditor.java index 37cf01c6cf40..54531c3ebb00 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ColorEditor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ColorEditor.java @@ -18,8 +18,8 @@ package com.intellij.uiDesigner.propertyInspector.editors; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TextFieldWithBrowseButton; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; -import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.lw.ColorDescriptor; import com.intellij.uiDesigner.propertyInspector.InplaceContext; @@ -238,7 +238,7 @@ public class ColorEditor extends PropertyEditor { getColorSelectionModel().setSelectedColor(new ColorDescriptorWrapper(descriptor)); } }); - add(new JBScrollPane(myDescriptorList), BorderLayout.CENTER); + add(ScrollPaneFactory.createScrollPane(myDescriptorList), BorderLayout.CENTER); } public String getDisplayName() { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java index 78ab96b48dd2..2e65436c94ab 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java @@ -52,7 +52,6 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.ColoredTreeCellRenderer; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.SimpleTextAttributes; -import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.GuiFormFileType; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.designSurface.InsertComponentProcessor; @@ -435,7 +434,7 @@ public class CreateSnapShotAction extends AnAction { while(componentClass != null) { if (JPanel.class.getName().equals(componentClass.getQualifiedName()) || JTabbedPane.class.getName().equals(componentClass.getQualifiedName()) || - JBScrollPane.class.getName().equals(componentClass.getQualifiedName()) || + JScrollPane.class.getName().equals(componentClass.getQualifiedName()) || JSplitPane.class.getName().equals(componentClass.getQualifiedName())) { return true; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterDaemon.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterDaemon.java index 3cff402afbd4..6334cfb4b026 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterDaemon.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterDaemon.java @@ -17,7 +17,6 @@ package com.intellij.uiDesigner.snapShooter; import com.intellij.openapi.vfs.CharsetToolkit; -import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.XmlWriter; import com.intellij.uiDesigner.radComponents.RadComponent; import com.intellij.uiDesigner.radComponents.RadRootContainer; @@ -167,8 +166,8 @@ public class SnapShooterDaemon implements Runnable { children.add(splitPane.getRightComponent()); } } - else if (parent instanceof JBScrollPane) { - JBScrollPane scrollPane = (JBScrollPane) parent; + else if (parent instanceof JScrollPane) { + JScrollPane scrollPane = (JScrollPane) parent; children.add(scrollPane.getViewport().getView()); } else if (parent instanceof Container) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java index 35946d165ab6..e00c35c53111 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java @@ -22,7 +22,6 @@ import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiType; import com.intellij.psi.util.PropertyUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; @@ -43,7 +42,7 @@ import java.util.Collections; final class BindToExistingBeanStep extends StepAdapter{ private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.wizard.BindToExistingBeanStep"); - private JBScrollPane myScrollPane; + private JScrollPane myScrollPane; private JTable myTable; private final WizardData myData; private final MyTableModel myTableModel; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java index 6858e474cef8..771892a62083 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java @@ -21,7 +21,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.IconLoader; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiNameHelper; -import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.UIDesignerBundle; import org.jetbrains.annotations.NotNull; @@ -37,7 +36,7 @@ import javax.swing.table.TableColumn; final class BindToNewBeanStep extends StepAdapter{ private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.wizard.BindToNewBeanStep"); - private JBScrollPane myScrollPane; + private JScrollPane myScrollPane; private JTable myTable; private final WizardData myData; private final MyTableModel myTableModel; diff --git a/plugins/ui-designer/src/gui-designer-properties.xml b/plugins/ui-designer/src/gui-designer-properties.xml index e15c6586ddc5..0aaf1144d061 100644 --- a/plugins/ui-designer/src/gui-designer-properties.xml +++ b/plugins/ui-designer/src/gui-designer-properties.xml @@ -243,7 +243,7 @@ - + diff --git a/plugins/ui-designer/testData/ChainedConstructorTest.java b/plugins/ui-designer/testData/ChainedConstructorTest.java index 30225ce92239..7634a4d512a9 100644 --- a/plugins/ui-designer/testData/ChainedConstructorTest.java +++ b/plugins/ui-designer/testData/ChainedConstructorTest.java @@ -13,13 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import com.intellij.ui.components.JBScrollPane; - import javax.swing.*; public class ChainedConstructorTest { private JComponent myRootComponent; - public JBScrollPane myScrollPane; + public JScrollPane myScrollPane; public JList myList; public ChainedConstructorTest() { diff --git a/plugins/ui-designer/testData/TestChainedConstructor.form b/plugins/ui-designer/testData/TestChainedConstructor.form index 0bc652e59c03..7224d51c5998 100644 --- a/plugins/ui-designer/testData/TestChainedConstructor.form +++ b/plugins/ui-designer/testData/TestChainedConstructor.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/ui-designer/testData/TestConditionalMethodCall.form b/plugins/ui-designer/testData/TestConditionalMethodCall.form index ac753233a6d1..fb1ef7493e1e 100644 --- a/plugins/ui-designer/testData/TestConditionalMethodCall.form +++ b/plugins/ui-designer/testData/TestConditionalMethodCall.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/ui-designer/testData/TestScrollPane.form b/plugins/ui-designer/testData/TestScrollPane.form index 4cc66bd6f340..fce2e496ce76 100644 --- a/plugins/ui-designer/testData/TestScrollPane.form +++ b/plugins/ui-designer/testData/TestScrollPane.form @@ -1,6 +1,6 @@

- + diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java index a7f99175f1f0..3f158c997295 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java @@ -17,7 +17,6 @@ package com.intellij.uiDesigner.core; import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.compiler.AsmCodeGenerator; import com.intellij.uiDesigner.compiler.FormErrorInfo; import com.intellij.uiDesigner.compiler.NestedFormLoader; @@ -216,7 +215,7 @@ public class AsmCodeGeneratorTest extends TestCase { } public void testScrollPane() throws Exception { - JBScrollPane scrollPane = (JBScrollPane)getInstrumentedRootComponent("TestScrollPane.form", "BindingTest"); + JScrollPane scrollPane = (JScrollPane)getInstrumentedRootComponent("TestScrollPane.form", "BindingTest"); assertTrue(scrollPane.getViewport().getView() instanceof JList); } @@ -291,7 +290,7 @@ public class AsmCodeGeneratorTest extends TestCase { Class cls = loadAndPatchClass("TestChainedConstructor.form", "ChainedConstructorTest"); Field scrollPaneField = cls.getField("myScrollPane"); Object instance = cls.newInstance(); - JBScrollPane scrollPane = (JBScrollPane) scrollPaneField.get(instance); + JScrollPane scrollPane = (JScrollPane) scrollPaneField.get(instance); assertNotNull(scrollPane.getViewport().getView()); } diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/EditContextDialog.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/EditContextDialog.java index 40fe64383d5a..36ccd7d3ea2f 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/EditContextDialog.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/EditContextDialog.java @@ -29,7 +29,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import com.intellij.psi.xml.XmlElement; -import com.intellij.ui.components.JBScrollPane; +import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.containers.BidirectionalMap; import com.intellij.util.ui.Table; import org.intellij.lang.xpath.XPathFileType; @@ -130,7 +130,7 @@ public class EditContextDialog extends DialogWrapper { final ActionManager actionManager = ActionManager.getInstance(); final JComponent varToolbar = actionManager.createActionToolbar("XPathVariables", group, true).getComponent(); p.add(varToolbar, BorderLayout.NORTH); - p.add(new JBScrollPane(myVariableTable), BorderLayout.CENTER); + p.add(ScrollPaneFactory.createScrollPane(myVariableTable), BorderLayout.CENTER); int extendedState = myDimensionService.getExtendedState(getDimensionServiceKey()); if (extendedState == -1) extendedState = 400; @@ -179,7 +179,7 @@ public class EditContextDialog extends DialogWrapper { n.add(nsToolbar, BorderLayout.NORTH); } - n.add(new JBScrollPane(myNamespaceTable), BorderLayout.CENTER); + n.add(ScrollPaneFactory.createScrollPane(myNamespaceTable), BorderLayout.CENTER); mySplitter.setFirstComponent(n); mySplitter.setSecondComponent(p); diff --git a/resources/src/idea/Palette2.xml b/resources/src/idea/Palette2.xml index e0b8e249b0bc..7f92643a21c2 100644 --- a/resources/src/idea/Palette2.xml +++ b/resources/src/idea/Palette2.xml @@ -22,7 +22,7 @@