From b4caafd564ecb8b2de69492baf1f5775f5bffda3 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Tue, 29 Jun 2010 17:34:30 +0400 Subject: [PATCH] All scrollpanes replaces with JBScrollPane. --- .../images/editor/impl/ImageEditorUI.java | 7 +-- .../thumbnail/impl/ThumbnailViewUI.java | 5 +- .../actions/GenerateAntBuildDialog.java | 3 +- .../AnnotationProcessorsConfigurable.java | 5 +- .../options/ProcessedModulesTable.java | 5 +- .../CompoundRendererConfigurable.java | 3 +- .../intellij/debugger/ui/ExportDialog.java | 3 +- .../com/intellij/debugger/ui/FramesPanel.java | 3 +- .../debugger/ui/impl/DebuggerTreeBase.java | 7 +-- .../debugger/ui/impl/InspectPanel.java | 6 +-- .../debugger/ui/impl/ThreadsPanel.java | 4 +- .../debugger/ui/impl/VariablesPanel.java | 3 +- .../intellij/debugger/ui/impl/WatchPanel.java | 4 +- .../NamedChildrenConfigurable.form | 2 +- .../ui/ConfigurationArgumentsHelpArea.form | 2 +- .../facetsTree/DetectedFacetsDialog.form | 2 +- .../FacetAutodetectionConfigurable.form | 4 +- .../ide/palette/impl/PaletteWindow.java | 11 +++-- .../importProject/ProjectLayoutPanel.java | 9 ++-- .../ProjectNameWithTypeStep.form | 4 +- .../util/projectWizard/JdkChooserPanel.java | 3 +- .../util/projectWizard/ModuleTypeStep.java | 5 +- .../openapi/projectRoots/ui/PathEditor.java | 3 +- .../roots/ui/configuration/SidePanel.java | 3 +- .../DetectedSourceRootsDialog.java | 9 ++-- .../CodeStyleGenerationConfigurable.form | 2 +- .../CodeStyleGenerationConfigurable.java | 3 +- .../options/editor/JavaAutoImportOptions.form | 2 +- .../RestoreReferencesDialog.java | 3 +- .../util/SpecialAnnotationsUtil.java | 9 ++-- .../ide/util/PackageChooserDialog.java | 3 +- .../ide/util/TreeClassChooserDialog.java | 3 +- .../ChangeClassSignatureDialog.java | 3 +- .../ChangeSignatureDialog.java | 7 +-- .../inCallers/CallerChooser.java | 3 +- .../EncapsulateFieldsDialog.java | 5 +- .../ExtractMethodObjectPanel.form | 2 +- .../EnclosingMethodSelectionDialog.java | 3 +- .../migration/EditMigrationDialog.java | 9 ++-- .../migration/MigrationDialog.form | 2 +- .../migration/MigrationDialog.java | 9 ++-- .../MoveInstanceMethodDialog.java | 3 +- .../MoveInstanceMethodDialogBase.java | 3 +- .../move/moveMembers/MoveMembersDialog.java | 3 +- .../ReplaceConstructorWithBuilderDialog.java | 5 +- .../safeDelete/OverridingMethodsDialog.java | 3 +- .../TurnRefsToSuperDialog.java | 5 +- .../ui/FailedConversionsDialog.java | 6 +-- .../refactoring/ui/MemberSelectionPanel.java | 3 +- .../refactoring/util/ParameterTablePanel.java | 3 +- .../createTest/CreateTestDialog.java | 3 +- .../intellij/unscramble/ThreadDumpPanel.java | 8 +++- .../fieldTest/after/ComponentCaller.java | 6 ++- .../fieldTest/before/ComponentCaller.java | 6 ++- .../ui/classFilter/ClassFilterEditor.java | 3 +- .../codeStyle/OptionTreeWithPreviewPanel.java | 5 +- .../options/colors/OptionsPanelImpl.java | 3 +- .../documentation/DocumentationComponent.java | 5 +- .../InspectionDescriptionLinkHandler.java | 3 +- .../config/IntentionDescriptionPanel.form | 2 +- .../impl/config/IntentionSettingsTree.java | 8 +++- .../codeInsight/lookup/impl/LookupImpl.java | 3 +- .../template/impl/TemplateListPanel.java | 5 +- .../ex/SeverityEditorDialog.java | 3 +- .../intellij/codeInspection/ui/Browser.java | 3 +- .../logging/LogConfigurationPanel.java | 3 +- .../impl/BaseExecuteBeforeRunDialog.java | 5 +- .../impl/ConfigurationSettingsEditor.form | 2 +- .../DefaultConfigurationSettingsEditor.java | 3 +- .../execution/impl/RunConfigurable.java | 3 +- .../impl/SingleConfigurationConfigurable.form | 2 +- .../impl/SingleConfigurationConfigurable.java | 3 +- .../intellij/find/impl/RegExHelpPopup.java | 5 +- .../ide/commander/CommanderPanel.java | 8 +++- .../FavoritesTreeViewPanel.java | 3 +- .../impl/AllFileTemplatesConfigurable.java | 3 +- .../impl/FileTemplateConfigurable.java | 3 +- .../ui/CreateFromTemplatePanel.java | 3 +- .../ide/hierarchy/HierarchyBrowserBaseEx.java | 3 +- .../com/intellij/ide/macro/MacrosDialog.java | 7 +-- .../NavBarRootPaneExtension.java | 5 +- .../impl/AbstractProjectViewPSIPane.java | 5 +- .../ide/scopeView/ScopeTreeViewPanel.java | 3 +- .../StructureViewComponent.java | 8 +++- .../src/com/intellij/ide/todo/TodoPanel.java | 3 +- .../ide/todo/configurable/FilterDialog.java | 3 +- .../todo/configurable/TodoConfigurable.java | 5 +- .../intellij/ide/util/DirectoryChooser.java | 3 +- .../com/intellij/ide/util/MemberChooser.java | 3 +- .../ide/util/TreeFileChooserDialog.java | 3 +- .../ide/util/gotoByName/ChooseByNameBase.java | 6 +-- .../injected/editor/EditorWindow.java | 3 +- .../internal/psiView/PsiViewerDialog.java | 5 +- .../diff/impl/settings/DiffOptionsPanel.form | 2 +- .../openapi/fileTypes/impl/PatternsPanel.form | 2 +- .../fileTypes/impl/RecognizedFileTypes.form | 2 +- .../impl/RemoveInvalidElementsDialog.form | 2 +- .../CommonContentEntriesEditor.java | 3 +- .../configuration/ContentEntryTreeEditor.java | 3 +- .../openapi/util/registry/RegistryUi.java | 10 ++-- .../encoding/FileEncodingConfigurable.form | 2 +- .../encoding/FileEncodingConfigurable.java | 3 +- .../ui/DependenciesPanel.java | 3 +- .../ui/SingleInspectionProfilePanel.java | 5 +- .../AbstactExtractMethodDialog.form | 4 +- .../AbstractParameterTablePanel.java | 5 +- .../rename/AutomaticRenamingDialog.form | 2 +- .../safeDelete/UnsafeUsagesDialog.java | 3 +- .../refactoring/ui/ConflictsDialog.java | 3 +- .../intellij/tools/OutputFiltersDialog.java | 5 +- .../src/com/intellij/tools/ToolsPanel.java | 3 +- .../debugger/extensions/DisposerDebugger.java | 5 +- .../ui/debugger/extensions/FocusDebugger.java | 5 +- .../debugger/extensions/PlaybackDebugger.java | 5 +- .../ui/classpath/SimpleClasspathPanel.java | 10 ++-- .../ui/tree/LanguagePerFileConfigurable.form | 2 +- .../ui/tree/LanguagePerFileConfigurable.java | 3 +- .../integration/ui/views/HistoryDialog.java | 3 +- .../execution/util/ExecutionErrorDialog.java | 5 +- .../editor/actions/ContentChooser.java | 5 +- .../openapi/ui/MasterDetailsComponent.java | 5 +- .../src/com/intellij/openapi/ui/Messages.java | 9 ++-- .../com/intellij/openapi/ui/StripeTable.java | 11 +++-- .../openapi/ui/popup/PopupChooserBuilder.java | 13 +++--- .../com/intellij/ui/AbstractFieldPanel.java | 3 +- .../intellij/ui/OptionalChooserComponent.form | 2 +- .../intellij/ui/PathsChooserComponent.form | 2 +- .../com/intellij/ui/ScrollPaneFactory.java | 10 ++-- .../JBScrollPane.java} | 22 +++++++-- .../ui/speedSearch/ListWithFilter.java | 11 +++-- .../com/intellij/ui/tabs/impl/JBTabsTest.java | 4 +- .../application/options/SelectFontDialog.java | 3 +- .../application/options/ShareSchemePanel.form | 2 +- .../pathMacros/PathMacroListEditor.form | 2 +- .../pathMacros/PathMacroListEditor.java | 3 +- .../codeInsight/hint/LineTooltipRenderer.java | 3 +- .../intellij/diagnostic/EAPSendErrorForm.form | 2 +- .../intellij/diagnostic/IdeErrorsDialog.java | 3 +- .../ui/AdaptiveTipDialog.java | 3 +- .../ui/ProgressTipPanel.form | 2 +- .../ui/ProgressTipPanel.java | 3 +- .../actionMacro/EditMacrosConfiguration.form | 4 +- .../errorTreeView/NewErrorTreeRenderer.java | 3 +- .../errorTreeView/NewErrorTreeViewPanel.java | 3 +- .../custom/impl/CustomFileTypeEditor.java | 3 +- .../ide/plugins/PluginManagerMain.form | 4 +- .../ide/plugins/PluginManagerMain.java | 5 +- .../ide/startupWizard/SelectPluginsStep.form | 4 +- .../CustomizableActionsPanel.form | 2 +- .../intellij/ide/util/ElementsChooser.java | 3 +- .../intellij/ide/util/ExportToFileUtil.java | 5 +- .../src/com/intellij/ide/util/TipPanel.java | 3 +- .../internal/encodings/ClasspathList.form | 2 +- .../impl/ui/NotificationsListPanel.java | 7 +-- .../command/impl/CannotUndoReportDialog.form | 2 +- .../intellij/openapi/editor/ex/EditorEx.java | 4 +- .../openapi/editor/impl/ContextMenuImpl.java | 5 +- .../openapi/editor/impl/EditorImpl.java | 10 ++-- .../editor/impl/LeftHandScrollbarLayout.java | 46 ++++++++++--------- .../editor/impl/ScrollingModelImpl.java | 5 +- .../fileChooser/ex/FileChooserDialogImpl.java | 3 +- .../fileTypes/ex/FileTypeChooserPanel.form | 2 +- .../openapi/keymap/impl/ui/ActionsTree.java | 3 +- .../impl/ui/KeyboardShortcutDialog.java | 3 +- .../openapi/keymap/impl/ui/KeymapPanel.java | 3 +- .../keymap/impl/ui/MouseShortcutDialog.java | 3 +- .../keymap/impl/ui/QuickListPanel.form | 4 +- .../keymap/impl/ui/QuickListsPanel.java | 3 +- .../ex/ControlPanelSettingsEditor.java | 8 +++- .../options/ex/ExplorerSettingsEditor.java | 5 +- .../options/newEditor/OptionsEditor.java | 3 +- .../options/newEditor/OptionsTree.java | 3 +- .../project/impl/DefineMacrosDialog.java | 3 +- .../updateSettings/impl/NoUpdatesPanel.form | 2 +- .../impl/UpdatesSettingsPanel.form | 2 +- .../readOnlyHandler/ReadOnlyStatusDialog.form | 2 +- .../vfs/encoding/ChooseEncodingDialog.form | 2 +- .../openapi/wm/impl/status/ProcessPopup.java | 3 +- .../wm/impl/welcomeScreen/WelcomeScreen.java | 17 +++---- .../platform/FilesystemToolwindow.java | 3 +- .../ui/MultilineTreeCellRenderer.java | 9 ++-- .../com/intellij/ui/plaf/beg/BegBorders.java | 3 +- .../com/intellij/ui/popup/WizardPopup.java | 5 +- .../util/ui/ValidatingTableEditor.form | 2 +- .../runner/ui/statistics/StatisticsPanel.form | 2 +- .../testframework/ui/TestResultsPanel.java | 9 ++-- .../openapi/vcs/ui/CommitMessage.java | 3 +- .../CompareWithSelectedRevisionAction.java | 5 +- .../vcs/changes/ChangesViewManager.java | 3 +- .../vcs/changes/UnversionedViewDialog.java | 3 +- .../committed/ChangeListDetailsAction.java | 7 +-- .../committed/ColumnFilteringStrategy.java | 3 +- .../committed/CommittedChangesBrowser.java | 5 +- .../CommittedChangesTreeBrowser.java | 3 +- .../committed/StructureFilteringStrategy.java | 5 +- .../vcs/changes/committed/WiseSplitter.java | 3 +- .../ChangelistConflictConfigurable.form | 2 +- .../conflicts/ChangelistConflictDialog.form | 2 +- .../shelf/ShelvedChangesViewManager.java | 3 +- .../changes/ui/ChangeListViewerDialog.java | 5 +- .../vcs/changes/ui/ChangesListView.java | 3 +- .../vcs/changes/ui/ChangesTreeList.java | 9 ++-- .../changes/ui/CommitChangeListDialog.java | 3 +- .../vcs/changes/ui/EditChangelistPanel.form | 2 +- .../vcs/changes/ui/IgnoredSettingsPanel.form | 2 +- .../IssueNavigationConfigurationPanel.form | 2 +- .../configurable/VcsConfigurationsDialog.form | 2 +- .../configurable/VcsConfigurationsDialog.java | 3 +- .../VcsDirectoryConfigurationPanel.java | 7 +-- .../vcs/history/FileHistoryPanelImpl.java | 3 +- .../vcs/merge/MultipleFileMergeDialog.form | 2 +- .../xdebugger/impl/ui/DebuggerUIUtil.java | 3 +- .../ig/bugs/IgnoreResultOfCallInspection.form | 2 +- .../ig/errorhandling/BadExceptionCaught.form | 2 +- .../errorhandling/BadExceptionDeclared.form | 2 +- .../ig/errorhandling/BadExceptionThrown.form | 2 +- ...tGuardedByLogConditionInspection.Form.form | 2 +- ...odNameMustStartWithQuestionInspection.java | 13 ++---- ...NameMayNotStartWithQuestionInspection.java | 13 ++---- .../com/siyeh/ig/naming/QuestionableName.form | 2 +- .../ig/resources/IOResourceInspection.java | 11 ++--- .../siyeh/ig/serialization/Serializable.form | 2 +- .../ig/telemetry/TelemetryDisplayImpl.form | 2 +- .../ig/telemetry/TelemetryDisplayImpl.java | 10 ++-- ...ThreadSafeStaticFieldFromInstanceForm.form | 2 +- .../config/ui/MethodParameterPanel.form | 2 +- .../config/execution/MessageTreeRenderer.java | 3 +- .../lang/ant/config/execution/TreeView.java | 3 +- .../lang/ant/config/explorer/AntExplorer.java | 8 +++- .../config/explorer/SaveMetaTargetDialog.java | 3 +- .../configuration/AnActionListEditor.form | 2 +- .../AntClasspathEditorPanel.form | 2 +- .../config/impl/configuration/FiltersTab.form | 2 +- .../impl/configuration/PropertiesTab.form | 2 +- .../copyright/ui/CopyrightEditorForm.form | 2 +- .../copyright/ui/ProjectSettingsPanel.java | 3 +- .../copyright/ui/TemplateCommentPanel.form | 2 +- .../config/ui/SelectCvsConfgurationPanel.java | 3 +- .../cvsSupport2/cvsBrowser/CvsTree.java | 3 +- .../importToCvs/ImportSettingsStep.form | 2 +- plugins/devkit/src/actions/NewActionForm.form | 4 +- .../devkit/src/util/ChooseModulesDialog.java | 3 +- .../checkin/GitPushActiveBranchesDialog.form | 2 +- .../git4idea/history/browser/GitLogTree.java | 5 +- .../browser/GitLogTreeFileSelector.java | 3 +- .../src/git4idea/rebase/GitRebaseEditor.form | 2 +- .../rebase/GitRebaseUnstructuredEditor.form | 2 +- .../git4idea/ui/GitConvertFilesDialog.form | 2 +- .../git4idea/ui/GitRefspecAddRefsDialog.form | 2 +- .../src/git4idea/ui/GitRefspecPanel.form | 2 +- .../src/git4idea/ui/GitTagDialog.form | 2 +- .../src/git4idea/ui/GitUnstashDialog.form | 2 +- .../GitUpdateLocallyModifiedDialog.form | 2 +- .../src/git4idea/vfs/GitFixRootsDialog.form | 2 +- .../dynamic/DynamicToolWindowWrapper.java | 7 +-- .../config/ui/ManagedLibrariesEditor.form | 2 +- .../groovy/doc/GroovyDocGenerationPanel.java | 3 +- .../groovy/gradle/ui/GradleSetupPanel.java | 19 ++------ .../GrChangeSignatureDialog.form | 4 +- .../changeSignature/TableWithButtons.form | 2 +- .../extractMethod/ParameterTablePanel.java | 3 +- .../zmlx/hg4idea/ui/HgGlobalStatusDialog.form | 2 +- .../zmlx/hg4idea/ui/HgGlobalStatusDialog.java | 15 ++---- .../indices/MavenArtifactSearchPanel.java | 3 +- .../indices/MavenIndicesConfigurable.form | 2 +- .../MavenProjectsNavigatorPanel.java | 4 +- .../SelectFromMavenProjectsDialog.java | 3 +- .../MavenIgnoredFilesConfigurable.form | 2 +- .../idea/maven/utils/ChooserDialog.java | 3 +- .../maven/wizards/MavenModuleWizardStep.form | 2 +- .../maven/wizards/MavenModuleWizardStep.java | 7 +-- .../editor/ResourceBundleEditor.java | 3 +- .../config/ConfigureProxiesOptionsPanel.form | 6 +-- .../dialogs/BranchConfigurationDialog.form | 2 +- .../idea/svn/dialogs/CopiesPanel.java | 3 +- .../idea/svn/dialogs/CopyDialog.form | 2 +- .../idea/svn/dialogs/LockDialog.java | 5 +- .../svn/dialogs/PagedListWithActions.java | 3 +- .../idea/svn/dialogs/PropertiesComponent.java | 5 +- .../dialogs/RepositoryBrowserComponent.java | 5 +- .../idea/svn/dialogs/SelectFilesDialog.java | 3 +- .../idea/svn/dialogs/ServerSSLDialog.java | 3 +- .../idea/svn/dialogs/SetPropertyDialog.form | 2 +- .../idea/svn/dialogs/SvnMapDialog.form | 2 +- .../browser/CheckoutOptionsDialog.form | 2 +- .../dialogs/browser/CopyOptionsDialog.form | 2 +- .../dialogs/browser/DeleteOptionsDialog.java | 3 +- .../dialogs/browser/ImportOptionsDialog.java | 3 +- .../dialogs/browser/MkdirOptionsDialog.form | 2 +- .../idea/svn/history/RootsAndBranches.java | 5 +- .../IntegratedSelectedOptionsDialog.form | 2 +- .../idea/svn/update/MultipleRootsEditor.form | 2 +- .../TestNGConfigurationEditor.form | 4 +- .../uiDesigner/actions/SurroundAction.java | 3 +- .../actions/SurroundActionGroup.java | 3 +- .../ConfigureClientPropertiesDialog.form | 4 +- .../designSurface/GridCaptionPanel.java | 3 +- .../uiDesigner/designSurface/GuiEditor.java | 3 +- .../InsertComponentProcessor.java | 3 +- .../inspections/NoScrollPaneInspection.java | 5 +- .../propertyInspector/PropertyInspector.java | 20 ++++---- .../UIDesignerToolWindowManager.java | 6 +-- .../editors/ColorEditor.java | 12 ++--- .../editors/FontEditorDialog.form | 8 ++-- .../editors/ListEditorDialog.form | 2 +- .../editors/string/StringEditorDialog.form | 2 +- .../radComponents/RadScrollPane.java | 11 +++-- .../snapShooter/CreateSnapShotAction.java | 3 +- .../snapShooter/CreateSnapShotForm.form | 2 +- .../snapShooter/SnapShooterDaemon.java | 5 +- .../wizard/BindToExistingBeanStep.form | 2 +- .../wizard/BindToExistingBeanStep.java | 5 +- .../uiDesigner/wizard/BindToNewBeanStep.form | 2 +- .../uiDesigner/wizard/BindToNewBeanStep.java | 5 +- .../src/gui-designer-properties.xml | 2 +- .../testData/ChainedConstructorTest.java | 7 +-- .../testData/TestChainedConstructor.form | 2 +- .../testData/TestConditionalMethodCall.form | 2 +- .../ui-designer/testData/TestScrollPane.form | 2 +- .../uiDesigner/core/AsmCodeGeneratorTest.java | 5 +- .../associations/impl/EditAssociations.form | 4 +- .../xpath/xslt/run/RunSettingsEditor.form | 2 +- .../xpathView/ui/EditContextDialog.java | 5 +- resources/src/idea/Palette2.xml | 4 +- .../application/options/TagListDialog.java | 3 +- 325 files changed, 795 insertions(+), 583 deletions(-) rename platform/platform-api/src/com/intellij/ui/{JScrollPane2.java => components/JBScrollPane.java} (71%) diff --git a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java index 1a93527258d2..a0fa17273b04 100644 --- a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java +++ b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java @@ -24,6 +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 org.intellij.images.ImagesBundle; import org.intellij.images.editor.ImageDocument; import org.intellij.images.editor.ImageEditor; @@ -97,9 +98,9 @@ final class ImageEditorUI extends JPanel implements DataProvider { view.addMouseListener(new EditorMouseAdapter()); view.addMouseListener(new FocusRequester()); - JScrollPane scrollPane = new JScrollPane(view); - scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); - scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + JBScrollPane scrollPane = new JBScrollPane(view); + scrollPane.setVerticalScrollBarPolicy(JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + scrollPane.setHorizontalScrollBarPolicy(JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); // Zoom by wheel listener scrollPane.addMouseWheelListener(wheelAdapter); diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java index c32a1893a5f3..94c77bb57bfb 100644 --- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java +++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java @@ -33,6 +33,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; 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; @@ -135,8 +136,8 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable { list.setFixedCellHeight(preferredSize.height); - JScrollPane scrollPane = new JScrollPane( - list, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER + JBScrollPane scrollPane = new JBScrollPane( + list, JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JBScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); ActionManager actionManager = ActionManager.getInstance(); 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 8bf2dba3161b..3f6e8b386164 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java @@ -27,6 +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.util.ArrayUtil; import com.intellij.util.Chunk; import com.intellij.util.ListWithSelection; @@ -176,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 JScrollPane scrollPane = new JScrollPane(myTable); + final JBScrollPane scrollPane = new JBScrollPane(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 8bd01c0e2215..443d462d9375 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java @@ -14,6 +14,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; 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; @@ -108,7 +109,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable myProcessorsModel = new ProcessorTableModel(); processorTablePanel.setBorder(new TitledBorder("Annotation Processors")); myProcessorTable = new Table(myProcessorsModel); - processorTablePanel.add(new JScrollPane(myProcessorTable), BorderLayout.CENTER); + processorTablePanel.add(new JBScrollPane(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)); @@ -387,4 +388,4 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable this.options = options != null? options : ""; } } -} \ No newline at end of file +} 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 f6dceaba6c7e..83182fe90548 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java @@ -24,6 +24,7 @@ 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; @@ -52,7 +53,7 @@ public class ProcessedModulesTable extends JPanel { myTable.setIntercellSpacing(new Dimension(0, 0)); myTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN); myTable.setColumnSelectionAllowed(false); - JScrollPane pane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane pane = ScrollPaneFactory.createScrollPane(myTable); pane.setPreferredSize(new Dimension(100, 155)); final TableColumnModel columnModel = myTable.getColumnModel(); @@ -433,4 +434,4 @@ public class ProcessedModulesTable extends JPanel { return component; } } -} \ No newline at end of file +} 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 14ef39900cc5..a2fe17314798 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/CompoundRendererConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/CompoundRendererConfigurable.java @@ -33,6 +33,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; 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; @@ -265,7 +266,7 @@ public class CompoundRendererConfigurable implements UnnamedConfigurable{ myDownButton.setEnabled(enabled); } }; - final JScrollPane scrollPane = new JScrollPane(myTable); + final JBScrollPane scrollPane = new JBScrollPane(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 c08839f11080..dae88c5419f7 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java @@ -38,6 +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.sun.jdi.*; import org.jetbrains.annotations.NonNls; @@ -97,7 +98,7 @@ public class ExportDialog extends DialogWrapper { protected JComponent createCenterPanel() { myTextArea.setEditable(false); - JScrollPane pane = new JScrollPane(myTextArea); + JBScrollPane pane = new JBScrollPane(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 e049aea72fc7..1fedf566d2f0 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java @@ -47,6 +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.sun.jdi.ObjectCollectedException; import javax.swing.*; @@ -96,7 +97,7 @@ public class FramesPanel extends UpdatableDebuggerView { setBorder(null); add(myThreadsCombo, BorderLayout.NORTH); - add(new JScrollPane(myFramesList), BorderLayout.CENTER); + add(new JBScrollPane(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 5585eb9be341..fb67af4d0770 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,6 +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.util.text.StringTokenizer; import com.intellij.util.ui.GeometryUtil; import com.intellij.util.ui.UIUtil; @@ -188,10 +189,10 @@ public class DebuggerTreeBase extends DnDAwareTree implements Disposable { } final JComponent tipContent = createTipContent(toolTipText, node); - final JScrollPane scrollPane = new JScrollPane(tipContent); + final JBScrollPane scrollPane = new JBScrollPane(tipContent); scrollPane.setBorder(null); - scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); - scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + scrollPane.setHorizontalScrollBarPolicy(JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + scrollPane.setVerticalScrollBarPolicy(JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); final Point point = e.getPoint(); SwingUtilities.convertPointToScreen(point, e.getComponent()); 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 f397326bc487..25da606ce7bd 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,9 +28,9 @@ 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 org.jetbrains.annotations.NotNull; -import javax.swing.*; import java.awt.*; public class InspectPanel extends DebuggerTreePanel { @@ -39,7 +39,7 @@ public class InspectPanel extends DebuggerTreePanel { getInspectTree().setInspectDescriptor(inspectDescriptor); - add(new JScrollPane(getInspectTree()), BorderLayout.CENTER); + add(new JBScrollPane(getInspectTree()), BorderLayout.CENTER); final Disposable disposable = DebuggerAction.installEditAction(getInspectTree(), DebuggerActions.EDIT_NODE_SOURCE); registerDisposable(disposable); setUpdateEnabled(true); @@ -57,4 +57,4 @@ public class InspectPanel extends DebuggerTreePanel { public InspectDebuggerTree getInspectTree() { return (InspectDebuggerTree)getTree(); } -} \ No newline at end of file +} 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 e63cd8f42886..e816c366b0d5 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,9 +30,9 @@ 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 org.jetbrains.annotations.NonNls; -import javax.swing.*; import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; @@ -59,7 +59,7 @@ public class ThreadsPanel extends DebuggerTreePanel{ } } }); - add(new JScrollPane(getThreadsTree()), BorderLayout.CENTER); + add(new JBScrollPane(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 5250b408d575..ca2fa5309422 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,6 +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 org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -39,7 +40,7 @@ public class VariablesPanel extends DebuggerTreePanel implements DataProvider{ final FrameDebuggerTree frameTree = getFrameTree(); - add(new JScrollPane(frameTree), BorderLayout.CENTER); + add(new JBScrollPane(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 e0564ac1c7be..aa9676711868 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,9 +32,9 @@ 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 org.jetbrains.annotations.NonNls; -import javax.swing.*; import java.awt.*; import java.util.Enumeration; @@ -43,7 +43,7 @@ public abstract class WatchPanel extends DebuggerTreePanel { public WatchPanel(Project project, DebuggerStateManager stateManager) { super(project, stateManager); - add(new JScrollPane(getWatchTree()), BorderLayout.CENTER); + add(new JBScrollPane(getWatchTree()), BorderLayout.CENTER); final Disposable disposable = DebuggerAction.installEditAction(getWatchTree(), DebuggerActions.EDIT_NODE_SOURCE); registerDisposable(disposable); } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/configurables/NamedChildrenConfigurable.form b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/configurables/NamedChildrenConfigurable.form index e657dd9084a2..419e226cedba 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/configurables/NamedChildrenConfigurable.form +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/configurables/NamedChildrenConfigurable.form @@ -27,7 +27,7 @@ - + diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.form b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.form index eea6a8731525..b5e4157642b5 100644 --- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.form +++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.form @@ -17,7 +17,7 @@ - + diff --git a/java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.form b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.form index 3a01e0f615f2..c1e808b35a12 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.form +++ b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.form @@ -16,7 +16,7 @@ - + diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.form b/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.form index 52761a159f9a..87e33caaf9e8 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.form +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.form @@ -84,7 +84,7 @@ - + @@ -142,7 +142,7 @@ - + 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 7ee8a74ec77a..52b123138422 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,6 +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.util.ArrayUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.annotations.NonNls; @@ -48,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 JScrollPane myScrollPane = new JScrollPane(); + private final JBScrollPane myScrollPane = new JBScrollPane(); private final MyListSelectionListener myListSelectionListener = new MyListSelectionListener(); private PaletteGroupHeader myLastFocusedGroup; @@ -111,7 +112,7 @@ public class PaletteWindow extends JPanel implements DataProvider { } for(String tabName: tabNames) { PaletteContentWindow contentWindow = new PaletteContentWindow(); - JScrollPane scrollPane = new JScrollPane(contentWindow); + JBScrollPane scrollPane = new JBScrollPane(contentWindow); scrollPane.addMouseListener(new MyScrollPanePopupHandler()); myTabbedPane.add(tabName, scrollPane); for(PaletteGroup group: currentGroups) { @@ -208,12 +209,12 @@ public class PaletteWindow extends JPanel implements DataProvider { } final int tabCount = collectTabNames(myGroups).length; if (tabCount > 0) { - JScrollPane activeScrollPane; + JBScrollPane activeScrollPane; if (tabCount == 1) { activeScrollPane = myScrollPane; } else { - activeScrollPane = (JScrollPane) myTabbedPane.getSelectedComponent(); + activeScrollPane = (JBScrollPane) myTabbedPane.getSelectedComponent(); } PaletteContentWindow activeContentWindow = (PaletteContentWindow) activeScrollPane.getViewport().getView(); PaletteGroupHeader groupHeader = activeContentWindow.getLastGroupHeader(); @@ -261,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) { - JScrollPane scrollPane = (JScrollPane) comp; + JBScrollPane scrollPane = (JBScrollPane) 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 e2d389b8638c..add44e023857 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 @@ -24,10 +24,11 @@ import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.ui.ex.MultiLineLabel; import com.intellij.openapi.util.IconLoader; 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.Nullable; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -76,11 +77,11 @@ abstract class ProjectLayoutPanel extends JPanel { final Splitter splitter = new Splitter(false); - final JScrollPane entriesPane = new JScrollPane(myEntriesChooser); + final JBScrollPane entriesPane = new JBScrollPane(myEntriesChooser); entriesPane.setBorder(BorderFactory.createTitledBorder(getEntriesChooserTitle())); splitter.setFirstComponent(entriesPane); - final JScrollPane depsPane = new JScrollPane(myDependenciesList); + final JBScrollPane depsPane = new JBScrollPane(myDependenciesList); depsPane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(getDependenciesTitle()), depsPane.getBorder())); splitter.setSecondComponent(depsPane); @@ -498,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 JScrollPane(myChooser), BorderLayout.CENTER); + labelChooser.add(new JBScrollPane(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/newProjectWizard/ProjectNameWithTypeStep.form b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.form index 1867d97754a8..b6bb1234a643 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.form +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.form @@ -73,7 +73,7 @@ - + @@ -108,7 +108,7 @@ - + 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 c86e803b19b0..6300b25802ec 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 @@ -31,6 +31,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.wm.ex.WindowManagerEx; 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; @@ -75,7 +76,7 @@ public class JdkChooserPanel extends JPanel { }); JPanel panel = new JPanel(new BorderLayout()); - panel.add(new JScrollPane(myList), BorderLayout.CENTER); + panel.add(new JBScrollPane(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 291b1bb4cd68..b76804dc1205 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,6 +30,7 @@ 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; @@ -151,13 +152,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 JScrollPane typesListScrollPane = ScrollPaneFactory.createScrollPane(myTypesList); + final JBScrollPane 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 JScrollPane descriptionScrollPane = ScrollPaneFactory.createScrollPane(myModuleDescriptionPane); + final JBScrollPane 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 bd91db835dd9..70ded06044e4 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,6 +34,7 @@ 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; @@ -173,7 +174,7 @@ public abstract class PathEditor { } }); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); + JBScrollPane 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 c00ec47cc2fa..c30ed9fbbe1b 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 @@ -18,6 +18,7 @@ package com.intellij.openapi.roots.ui.configuration; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.ui.popup.ListItemDescriptor; 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; @@ -79,7 +80,7 @@ public class SidePanel extends JPanel { myList.setCellRenderer(new GroupedItemsListRenderer(descriptor)); - add(new JScrollPane(myList), BorderLayout.CENTER); + add(new JBScrollPane(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 769a89ad54b8..f6c339a2b81c 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 @@ -24,6 +24,7 @@ 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.util.Icons; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.NonNls; @@ -60,7 +61,7 @@ public class DetectedSourceRootsDialog extends DialogWrapper { /** * A scrollable pane that contains myTree */ - private final JScrollPane myPane; + private final JBScrollPane myPane; /** * A constructor @@ -103,7 +104,7 @@ public class DetectedSourceRootsDialog extends DialogWrapper { super(project, true); myRootNode = tree; myTree = createCheckboxTree(); - myPane = new JScrollPane(myTree); + myPane = new JBScrollPane(myTree); setTitle("Detected Source Roots"); init(); } @@ -118,7 +119,7 @@ public class DetectedSourceRootsDialog extends DialogWrapper { super(component, true); myRootNode = tree; myTree = createCheckboxTree(); - myPane = new JScrollPane(myTree); + myPane = new JBScrollPane(myTree); setTitle("Detected Source Roots"); init(); } @@ -258,4 +259,4 @@ public class DetectedSourceRootsDialog extends DialogWrapper { protected String getDimensionServiceKey() { return "DetectedSourceRootsDialog"; } -} \ No newline at end of file +} diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form index f515b1a3a932..4bb9a84b13be 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form @@ -188,7 +188,7 @@ - + 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 5ed0323ecfd0..5513a4b2347a 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java @@ -24,6 +24,7 @@ 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; @@ -48,7 +49,7 @@ public class CodeStyleGenerationConfigurable implements Configurable { private final MembersOrderList myMembersOrderList; - private JScrollPane myMembersListScroll; + private JBScrollPane myMembersListScroll; private JButton myMoveUpButton; private JButton myMoveDownButton; diff --git a/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form b/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form index 82146d2e4983..b94b25dd3702 100644 --- a/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form +++ b/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form @@ -64,7 +64,7 @@ - + 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 f13e566292a5..00e6af7d9b8f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java @@ -23,6 +23,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.VerticalFlowLayout; import com.intellij.psi.PsiClass; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import java.awt.*; @@ -65,7 +66,7 @@ class RestoreReferencesDialog extends DialogWrapper { myList = new JBList(myNamedElements); myList.setCellRenderer(new FQNameCellRenderer()); myList.setBorder(BorderFactory.createEtchedBorder()); - panel.add(new JScrollPane(myList), BorderLayout.CENTER); + panel.add(new JBScrollPane(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 ae8060c18818..7002a579d50f 100644 --- a/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java +++ b/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java @@ -26,8 +26,8 @@ import com.intellij.codeInspection.ex.InspectionProfileImpl; import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.ActionPlaces; -import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.ActionToolbar; +import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; @@ -40,6 +40,7 @@ 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; @@ -99,10 +100,10 @@ public class SpecialAnnotationsUtil { } }); - final JScrollPane listScrollPane = ScrollPaneFactory.createScrollPane(injectionList); + final JBScrollPane listScrollPane = ScrollPaneFactory.createScrollPane(injectionList); // listScrollPane.setBorder(BorderFactory.createEtchedBorder()); - listScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); - listScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + listScrollPane.setVerticalScrollBarPolicy(JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + listScrollPane.setHorizontalScrollBarPolicy(JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); final FontMetrics fontMetrics = injectionList.getFontMetrics(injectionList.getFont()); listScrollPane.setPreferredSize(new Dimension(0, fontMetrics.getHeight() * 5)); listScrollPane.setMinimumSize(new Dimension(0, fontMetrics.getHeight() * 3)); 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 f88a7847c4b5..1ef57b658c79 100644 --- a/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java +++ b/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java @@ -36,6 +36,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; 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; @@ -124,7 +125,7 @@ public class PackageChooserDialog extends PackageChooser { ); myTree.setBorder(BorderFactory.createEtchedBorder()); - JScrollPane scrollPane = new JScrollPane(myTree); + JBScrollPane scrollPane = new JBScrollPane(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 ec48f12807c9..45a5d6e32725 100644 --- a/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java +++ b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java @@ -43,6 +43,7 @@ import com.intellij.psi.search.PsiShortNamesCache; import com.intellij.psi.util.PsiUtilBase; 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; @@ -168,7 +169,7 @@ public class TreeClassChooserDialog extends DialogWrapper implements TreeClassCh myTree.setCellRenderer(new NodeRenderer()); UIUtil.setLineStyleAngled(myTree); - JScrollPane scrollPane = new JScrollPane(myTree); + JBScrollPane scrollPane = new JBScrollPane(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 5ae76009eeaa..f237c33863af 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java @@ -27,6 +27,7 @@ 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; @@ -110,7 +111,7 @@ public class ChangeClassSignatureDialog extends RefactoringDialog { JPanel panel = new JPanel(new BorderLayout()); panel.setBorder(IdeBorderFactory.createTitledBorder(RefactoringBundle.message("changeClassSignature.parameters.panel.border.title"))); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane 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 bea5505e1410..b42320565537 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java @@ -43,6 +43,7 @@ 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; @@ -319,7 +320,7 @@ public class ChangeSignatureDialog extends RefactoringDialog { JPanel panel = new JPanel(new BorderLayout()); panel.setBorder(IdeBorderFactory.createTitledBorder(borderTitle)); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); + JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); JPanel tablePanel = new JPanel(new BorderLayout()); tablePanel.add(scrollPane, BorderLayout.CENTER); @@ -416,7 +417,7 @@ public class ChangeSignatureDialog extends RefactoringDialog { mySignatureArea.setEditable(false); mySignatureArea.setBackground(getContentPane().getBackground()); //mySignatureArea.setFont(myTableFont); - JScrollPane scrollPane = new JScrollPane(mySignatureArea); + JBScrollPane scrollPane = new JBScrollPane(mySignatureArea); scrollPane.setBorder(IdeBorderFactory.createEmptyBorder(new Insets(0,0,0,0))); panel.add(scrollPane, BorderLayout.CENTER); @@ -738,4 +739,4 @@ public class ChangeSignatureDialog extends RefactoringDialog { return textField; } } -} \ No newline at end of file +} 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 9bbf2f171c3a..c4a67e0709b1 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 @@ -37,6 +37,7 @@ 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.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.containers.HashSet; @@ -103,7 +104,7 @@ public abstract class CallerChooser extends DialogWrapper { }; myTree.getSelectionModel().addTreeSelectionListener(myTreeSelectionListener); - JScrollPane scrollPane = new JScrollPane(myTree); + JBScrollPane scrollPane = new JBScrollPane(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 d3fd0e5d3a1a..9daee6a791ea 100644 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java @@ -24,13 +24,14 @@ import com.intellij.psi.*; import com.intellij.psi.util.PropertyUtil; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.JavaRefactoringSettings; +import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.ui.DocCommentPanel; 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; @@ -389,7 +390,7 @@ public String getAccessorsVisibility() { myTable.setPreferredScrollableViewportSize(new Dimension(550, myTable.getRowHeight() * 12)); myTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane 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/extractMethodObject/ExtractMethodObjectPanel.form b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form index 3a6d66115540..4416e26ee35e 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form +++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form @@ -157,7 +157,7 @@ - + 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 a7c4f51cc4b7..14bbb0587a6a 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java @@ -31,6 +31,7 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.ui.MethodCellRenderer; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import java.awt.*; @@ -94,7 +95,7 @@ public class EnclosingMethodSelectionDialog extends DialogWrapper { int indexToSelect = 0; myEnclosingMethodsList.setSelectedIndex(indexToSelect); gbConstraints.gridy++; - panel.add(new JScrollPane(myEnclosingMethodsList), gbConstraints); + panel.add(new JBScrollPane(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 09f874f36852..18479c962486 100644 --- a/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java @@ -22,6 +22,7 @@ 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.*; @@ -116,10 +117,10 @@ public class EditMigrationDialog extends DialogWrapper{ myDescriptionTextArea = new JTextArea(myMigrationMap.getDescription(), 3, 40); myDescriptionTextArea.setLineWrap(true); myDescriptionTextArea.setWrapStyleWord(true); - JScrollPane scrollPane = new JScrollPane(myDescriptionTextArea); + JBScrollPane scrollPane = new JBScrollPane(myDescriptionTextArea); scrollPane.setBorder(null); - scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER); + scrollPane.setHorizontalScrollBarPolicy(JBScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setVerticalScrollBarPolicy(JBScrollPane.VERTICAL_SCROLLBAR_NEVER); myDescriptionTextArea.setFont(myNameField.getFont()); myDescriptionTextArea.setBackground(myNameField.getBackground()); scrollPane.setBorder(myNameField.getBorder()); @@ -294,7 +295,7 @@ public class EditMigrationDialog extends DialogWrapper{ myTable.setRowSelectionInterval(selected + 1, selected + 1); } - private JScrollPane createTable() { + private JBScrollPane createTable() { final String[] names = { RefactoringBundle.message("migration.type.column.header"), RefactoringBundle.message("migration.old.name.column.header"), diff --git a/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.form b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.form index 7f855e238bb8..b475693eda79 100644 --- a/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.form +++ b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.form @@ -38,7 +38,7 @@ - + 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 747681721981..b48d8cd4bd0d 100644 --- a/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java @@ -22,6 +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 javax.swing.*; import java.awt.event.ActionEvent; @@ -42,7 +43,7 @@ public class MigrationDialog extends DialogWrapper{ private final MigrationMapSet myMigrationMapSet; private JLabel promptLabel; private JSeparator mySeparator; - private JScrollPane myDescriptionScroll; + private JBScrollPane myDescriptionScroll; public MigrationDialog(Project project, MigrationMapSet migrationMapSet) { @@ -73,11 +74,11 @@ public class MigrationDialog extends DialogWrapper{ initMapCombobox(); myDescriptionTextArea = new MyTextArea("", 3, 40); - JScrollPane scrollPane = new JScrollPane(myDescriptionTextArea); + JBScrollPane scrollPane = new JBScrollPane(myDescriptionTextArea); myDescriptionScroll.getViewport().add(myDescriptionTextArea); myDescriptionScroll.setBorder(null); - myDescriptionScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - myDescriptionScroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER); + myDescriptionScroll.setHorizontalScrollBarPolicy(JBScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + myDescriptionScroll.setVerticalScrollBarPolicy(JBScrollPane.VERTICAL_SCROLLBAR_NEVER); myDescriptionTextArea.setEditable(false); myDescriptionTextArea.setFont(promptLabel.getFont()); myDescriptionTextArea.setBackground(myPanel.getBackground()); 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 5e5377257c49..9479d6c5fa0a 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,6 +25,7 @@ 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; @@ -72,7 +73,7 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase { jLabel.setText(RefactoringBundle.message("moveInstanceMethod.select.an.instance.parameter")); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); + final JBScrollPane 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 4c2cd0817f7d..db37613ad780 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,6 +28,7 @@ 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.*; @@ -60,7 +61,7 @@ public abstract class MoveInstanceMethodDialogBase extends RefactoringDialog { protected JPanel createListAndVisibilityPanels() { myList = createTargetVariableChooser(); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); + final JBScrollPane 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 b5bcb014ddc7..1d291e590a59 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,6 +44,7 @@ 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; @@ -192,7 +193,7 @@ public class MoveMembersDialog extends RefactoringDialog implements MoveMembersO if (table.getRowCount() > 0) { table.getSelectionModel().addSelectionInterval(0, 0); } - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); + JBScrollPane 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 7c0e18a9e65f..8931d5b70246 100644 --- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java @@ -34,6 +34,7 @@ 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; @@ -167,7 +168,7 @@ public class ReplaceConstructorWithBuilderDialog extends RefactoringDialog { } } - private JScrollPane createTablePanel() { + private JBScrollPane createTablePanel() { myTableModel = new MyTableModel(); myTable = new Table(myTableModel); myTable.setSurrendersFocusOnKeystroke(true); @@ -196,7 +197,7 @@ public class ReplaceConstructorWithBuilderDialog extends RefactoringDialog { myTable.setPreferredScrollableViewportSize(new Dimension(550, myTable.getRowHeight() * 12)); myTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + final JBScrollPane 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 2b004c272dfa..a8a08a5143c1 100644 --- a/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java @@ -28,6 +28,7 @@ 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; @@ -167,7 +168,7 @@ class OverridingMethodsDialog extends DialogWrapper { panel.setBorder(border);*/ panel.setLayout(new BorderLayout()); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane 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 76f60fc60bd3..896414525066 100644 --- a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java @@ -28,13 +28,14 @@ import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.JavaRefactoringSettings; +import com.intellij.refactoring.RefactoringBundle; 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.components.JBList; +import com.intellij.ui.components.JBScrollPane; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -109,7 +110,7 @@ public class TurnRefsToSuperDialog extends RefactoringDialog { } mySuperClassesList.setSelectedIndex(indexToSelect); gbConstraints.gridy++; - panel.add(new JScrollPane(mySuperClassesList), gbConstraints); + panel.add(new JBScrollPane(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 991bfc75342c..61570c127bfc 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,13 +7,13 @@ 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 org.jetbrains.annotations.NonNls; import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; -import org.jetbrains.annotations.NonNls; - public class FailedConversionsDialog extends DialogWrapper { private final String[] myConflictDescriptions; public static final int VIEW_USAGES_EXIT_CODE = NEXT_USER_EXIT_CODE; @@ -36,7 +36,7 @@ public class FailedConversionsDialog extends DialogWrapper { @NonNls final String contentType = "text/html"; final JEditorPane messagePane = new JEditorPane(contentType, ""); messagePane.setEditable(false); - JScrollPane scrollPane = new JScrollPane(messagePane); + JBScrollPane scrollPane = new JBScrollPane(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 52691a79719a..69e56df1d7ba 100644 --- a/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java +++ b/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java @@ -27,6 +27,7 @@ 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; @@ -45,7 +46,7 @@ public class MemberSelectionPanel extends JPanel { setLayout(new BorderLayout()); myTable = createMemberSelectionTable(memberInfo, abstractColumnHeader); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane 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 6ab2bcf8c6f4..800d381e9da4 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java +++ b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java @@ -24,6 +24,7 @@ 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; @@ -230,7 +231,7 @@ public abstract class ParameterTablePanel extends JPanel { }); JPanel listPanel = new JPanel(new BorderLayout()); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane 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 fd1b11722c17..d75ef667c534 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java @@ -52,6 +52,7 @@ 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; @@ -374,7 +375,7 @@ public class CreateTestDialog extends DialogWrapper { constr.gridwidth = GridBagConstraints.REMAINDER; constr.fill = GridBagConstraints.BOTH; constr.weighty = 1; - panel.add(new JScrollPane(myMethodsTable), constr); + panel.add(new JBScrollPane(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 d53af0eb4bfd..17018274803c 100644 --- a/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java +++ b/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java @@ -24,8 +24,12 @@ 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.*; +import com.intellij.ui.ColoredListCellRenderer; +import com.intellij.ui.LayeredIcon; +import com.intellij.ui.LightColors; +import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -88,7 +92,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 JScrollPane(myThreadList)); + splitter.setFirstComponent(new JBScrollPane(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 81cf4aca07d6..ffe0535e5e5e 100644 --- a/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java @@ -1,5 +1,7 @@ -import java.awt.BorderLayout; +import com.intellij.ui.components.JBScrollPane; + import javax.swing.*; +import java.awt.*; public class ComponentCaller extends JComponent{ Component1 component1; @@ -11,7 +13,7 @@ public class ComponentCaller extends JComponent{ private void buildUI() { setLayout(new BorderLayout()); - add(new JScrollPane(component1)); + add(new JBScrollPane(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 81cf4aca07d6..ffe0535e5e5e 100644 --- a/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java @@ -1,5 +1,7 @@ -import java.awt.BorderLayout; +import com.intellij.ui.components.JBScrollPane; + import javax.swing.*; +import java.awt.*; public class ComponentCaller extends JComponent{ Component1 component1; @@ -11,7 +13,7 @@ public class ComponentCaller extends JComponent{ private void buildUI() { setLayout(new BorderLayout()); - add(new JScrollPane(component1)); + add(new JBScrollPane(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 cb964f5b21c3..f2f29bd8cbf6 100644 --- a/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java +++ b/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java @@ -29,6 +29,7 @@ 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; @@ -67,7 +68,7 @@ public class ClassFilterEditor extends JPanel { myAddPatternButton = new JButton(getAddPatternButtonText()); myRemoveButton = new JButton(UIBundle.message("button.remove")); myTable = new Table(); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane 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 2d567373a172..f8d7e2b65f03 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,6 +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.treeStructure.Tree; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; @@ -51,7 +52,7 @@ public abstract class OptionTreeWithPreviewPanel extends MultilanguageCodeStyleA myOptionsTree = createOptionsTree(); myOptionsTree.setCellRenderer(new MyTreeCellRenderer()); - myPanel.add(new JScrollPane(myOptionsTree), + myPanel.add(new JBScrollPane(myOptionsTree), new GridBagConstraints(0, 0, 1, 1, 0, 1, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(7, 7, 3, 4), 0, 0)); @@ -492,4 +493,4 @@ public abstract class OptionTreeWithPreviewPanel extends MultilanguageCodeStyleA public JComponent getInternalPanel() { return myPanel; } -} \ No newline at end of file +} 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 f4adb3ee3670..d2d781bedb59 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 @@ -18,6 +18,7 @@ package com.intellij.application.options.colors; import com.intellij.ui.ListScrollingUtil; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.EventDispatcher; import javax.swing.*; @@ -74,7 +75,7 @@ public class OptionsPanelImpl extends JPanel implements OptionsPanel { myOptionsList.setModel(new DefaultListModel()); myOptionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - JScrollPane scrollPane = new JScrollPane(myOptionsList); + JBScrollPane scrollPane = new JBScrollPane(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 8445802578f9..eb5b1fdbd7e9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java @@ -32,6 +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.util.containers.HashMap; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -73,7 +74,7 @@ public class DocumentationComponent extends JPanel implements Disposable { } } - private final JScrollPane myScrollPane; + private final JBScrollPane myScrollPane; private final JEditorPane myEditorPane; private String myText; // myEditorPane.getText() surprisingly crashes.., let's cache the text private final JPanel myControlPanel; @@ -132,7 +133,7 @@ public class DocumentationComponent extends JPanel implements Disposable { myEditorPane.setEditable(false); myEditorPane.setBackground(HintUtil.INFORMATION_COLOR); myEditorPane.setEditorKit(UIUtil.getHTMLEditorKit()); - myScrollPane = new JScrollPane(myEditorPane); + myScrollPane = new JBScrollPane(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 df0a82458909..41302c3bc0dd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/InspectionDescriptionLinkHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/InspectionDescriptionLinkHandler.java @@ -27,6 +27,7 @@ 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; @@ -67,7 +68,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 JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(pane); + final JBScrollPane 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/IntentionDescriptionPanel.form b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.form index 4f7f2e9ea389..daf12a07fb47 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.form +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.form @@ -56,7 +56,7 @@ - + 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 452038a06e3c..de7e778be702 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,7 +29,11 @@ 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.*; +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.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; @@ -91,7 +95,7 @@ public abstract class IntentionSettingsTree { myFilter = new MyFilterComponent(); myComponent = new JPanel(new BorderLayout()); - JScrollPane scrollPane = new JScrollPane(myTree); + JBScrollPane scrollPane = new JBScrollPane(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 a8fadc00d060..22ec2cbe7a38 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 @@ -41,6 +41,7 @@ import com.intellij.psi.PsiFile; import com.intellij.ui.LightweightHint; import com.intellij.ui.ListScrollingUtil; 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; @@ -126,7 +127,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myList.setBackground(LookupCellRenderer.BACKGROUND_COLOR); - JScrollPane scrollPane = new JScrollPane(myList); + JBScrollPane scrollPane = new JBScrollPane(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 e212476b5c04..da65c8ba4e99 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,6 +31,7 @@ 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; @@ -614,7 +615,7 @@ class TemplateListPanel extends JPanel { } - private JScrollPane createTable() { + private JBScrollPane createTable() { myTreeRoot = new CheckedTreeNode(null); myTree = new CheckboxTree(new CheckboxTree.CheckboxTreeCellRenderer(){ @@ -749,7 +750,7 @@ class TemplateListPanel extends JPanel { } ); - JScrollPane scrollpane = ScrollPaneFactory.createScrollPane(myTree); + JBScrollPane 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 5565b2a3ce8f..21894739584a 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java @@ -49,6 +49,7 @@ import com.intellij.ui.LightColors; import com.intellij.ui.ListUtil; import com.intellij.ui.ReorderableListController; 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; @@ -105,7 +106,7 @@ public class SeverityEditorDialog extends DialogWrapper { } }); myOptionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - JScrollPane scrollPane = new JScrollPane(myOptionsList); + JBScrollPane scrollPane = new JBScrollPane(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 9de9412a0553..1c95ec564dd6 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/Browser.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/Browser.java @@ -32,6 +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.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -249,7 +250,7 @@ public class Browser extends JPanel { }; myHTMLViewer.addHyperlinkListener(myHyperLinkListener); - add(new JScrollPane(myHTMLViewer), BorderLayout.CENTER); + add(new JBScrollPane(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 e62ebf5f3c3a..295b1d80af50 100644 --- a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConfigurationPanel.java +++ b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConfigurationPanel.java @@ -27,6 +27,7 @@ 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; @@ -124,7 +125,7 @@ public class LogConfigurationPanel extends Setti myRemoveButton.setEnabled(myFilesTable.getSelectedRowCount() >=1); } }); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myFilesTable); + final JBScrollPane 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 c2da67d54f43..297dc877dd79 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java @@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Key; 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; @@ -104,7 +105,7 @@ public abstract class BaseExecuteBeforeRunDialog extend expacndChecked(tree); - JScrollPane scrollPane = new JScrollPane(tree); + JBScrollPane scrollPane = new JBScrollPane(tree); scrollPane.setPreferredSize(new Dimension(400, 400)); panel.add(scrollPane, BorderLayout.CENTER); return panel; @@ -352,4 +353,4 @@ public abstract class BaseExecuteBeforeRunDialog extend } } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.form b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.form index 1d7698441741..191ba71bd7b8 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.form +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.form @@ -8,7 +8,7 @@ - + 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 56265066a2a5..cb3ed137db16 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/DefaultConfigurationSettingsEditor.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/DefaultConfigurationSettingsEditor.java @@ -23,6 +23,7 @@ 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; @@ -58,7 +59,7 @@ public class DefaultConfigurationSettingsEditor implements Configurable { public JComponent createComponent() { final JPanel wholePanel = new JPanel(new BorderLayout()); - final JScrollPane pane = ScrollPaneFactory.createScrollPane(myTree); + final JBScrollPane 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 ffce688156de..e85e33c7b7d9 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -41,6 +41,7 @@ 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; @@ -317,7 +318,7 @@ class RunConfigurable extends BaseConfigurable { true).getComponent(); leftPanel.add(myToolbarComponent, BorderLayout.NORTH); initTree(); - final JScrollPane pane = ScrollPaneFactory.createScrollPane(myTree); + final JBScrollPane 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.form b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form index f21169b46fe4..372d21aabcfb 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form +++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form @@ -70,7 +70,7 @@ - + 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 1a7eea21c846..1fbb29a6f4d5 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java @@ -26,6 +26,7 @@ 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.*; @@ -208,7 +209,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)); - JScrollPane attrScroll = new JScrollPane(myScrollPanel); + JBScrollPane attrScroll = new JBScrollPane(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 849f76b32721..c95b312f8c93 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java @@ -41,6 +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.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.EditSourceOnDoubleClickHandler; @@ -147,7 +148,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem return HierarchyBrowserBaseEx.this.getPrevOccurenceActionNameImpl(); } }); - myTreePanel.add(new JScrollPane(tree), key); + myTreePanel.add(new JBScrollPane(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 a69e5829d9be..94f9ece0b488 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java @@ -24,6 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -128,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 JScrollPane(myMacrosList), constr); + panel.add(new JBScrollPane(myMacrosList), constr); myMacrosList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myMacrosList.setPreferredSize(null); @@ -149,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 JScrollPane(myPreviewTextarea), constr); + panel.add(new JBScrollPane(myPreviewTextarea), constr); myPreviewTextarea.setEditable(false); myPreviewTextarea.setLineWrap(true); myPreviewTextarea.setPreferredSize(null); @@ -219,4 +220,4 @@ public final class MacrosDialog extends DialogWrapper { public JComponent getPreferredFocusedComponent() { return myMacrosList; } -} \ No newline at end of file +} 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 da480b608f1b..95651134437d 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java @@ -24,6 +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.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -51,8 +52,8 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension { myPanel.setBackground(UIUtil.getListBackground()); myNavigationBar = new NavBarPanel(myProject); - JScrollPane scroller = new JScrollPane(myNavigationBar); - scroller.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER); + JBScrollPane scroller = new JBScrollPane(myNavigationBar); + scroller.setVerticalScrollBarPolicy(JBScrollPane.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 0e90c8fde681..5fa5df2aca65 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 @@ -34,6 +34,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.vfs.VirtualFile; 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; @@ -55,7 +56,7 @@ import java.util.ArrayList; import java.util.StringTokenizer; public abstract class AbstractProjectViewPSIPane extends AbstractProjectViewPane { - private JScrollPane myComponent; + private JBScrollPane myComponent; protected AbstractProjectViewPSIPane(Project project) { super(project); @@ -68,7 +69,7 @@ public abstract class AbstractProjectViewPSIPane extends AbstractProjectViewPane DefaultTreeModel treeModel = new DefaultTreeModel(rootNode); myTree = createTree(treeModel); enableDnD(); - myComponent = new JScrollPane(myTree); + myComponent = new JBScrollPane(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 811f51e47b2e..bc6fc9c25852 100644 --- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java @@ -66,6 +66,7 @@ import com.intellij.psi.search.scope.packageSet.PackageSet; import com.intellij.ui.ColoredTreeCellRenderer; 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; @@ -120,7 +121,7 @@ public class ScopeTreeViewPanel extends JPanel implements JDOMExternalizable, Di myProject = project; initTree(); - add(new JScrollPane(myTree), BorderLayout.CENTER); + add(new JBScrollPane(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 33326dc9cd55..e1b4dbbc8fab 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 @@ -25,7 +25,10 @@ import com.intellij.ide.structureView.impl.StructureViewFactoryImpl; import com.intellij.ide.structureView.impl.StructureViewState; import com.intellij.ide.structureView.impl.common.PsiTreeElementBase; import com.intellij.ide.ui.customization.CustomizationUtil; -import com.intellij.ide.util.treeView.*; +import com.intellij.ide.util.treeView.AbstractTreeNode; +import com.intellij.ide.util.treeView.AbstractTreeStructure; +import com.intellij.ide.util.treeView.NodeDescriptorProvidingKey; +import com.intellij.ide.util.treeView.NodeRenderer; import com.intellij.ide.util.treeView.smartTree.*; import com.intellij.ide.util.treeView.smartTree.TreeModel; import com.intellij.openapi.Disposable; @@ -45,6 +48,7 @@ import com.intellij.psi.impl.source.tree.CompositeElement; import com.intellij.ui.AutoScrollFromSourceHandler; import com.intellij.ui.AutoScrollToSourceHandler; 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; @@ -138,7 +142,7 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre } }); - setContent(new JScrollPane(myAbstractTreeBuilder.getTree())); + setContent(new JBScrollPane(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 67cd62975509..4ac33b59250e 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java @@ -49,6 +49,7 @@ import com.intellij.psi.PsiFile; import com.intellij.ui.AutoScrollToSourceHandler; import com.intellij.ui.PopupHandler; 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; @@ -148,7 +149,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig } } ); - setContent(new JScrollPane(myTree)); + setContent(new JBScrollPane(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 5dba7815e98b..1617f01b6682 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,6 +25,7 @@ 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.*; @@ -130,7 +131,7 @@ class FilterDialog extends DialogWrapper { Border border = IdeBorderFactory.createTitledBorder(IdeBundle.message("group.todo.filter.patterns")); patternsPanel.setBorder(border); myTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane 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 3cb5d9ff3eeb..abef7b89ce6a 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,6 +30,7 @@ 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; @@ -196,7 +197,7 @@ public class TodoConfigurable extends BaseConfigurable implements SearchableConf ((DefaultCellEditor)myPatternsTable.getDefaultEditor(String.class)).setClickCountToStart(2); - JScrollPane myPatternsScroll = ScrollPaneFactory.createScrollPane(myPatternsTable); + JBScrollPane myPatternsScroll = ScrollPaneFactory.createScrollPane(myPatternsTable); // myPatternsScroll.getViewport().add(myPatternsTable); myPatternsScroll.setPreferredSize(new Dimension(-1, myPatternsTable.getRowHeight() * 12)); @@ -289,7 +290,7 @@ public class TodoConfigurable extends BaseConfigurable implements SearchableConf protected JComponent createMainComponent() { myFiltersTable = new Table(myFiltersModel); myFiltersTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - JScrollPane myFiltersScroll = ScrollPaneFactory.createScrollPane(myFiltersTable); + JBScrollPane 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 2f429e1f40e4..57f3bd68c9bd 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java @@ -27,6 +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.util.ArrayUtil; import com.intellij.util.Icons; import org.jetbrains.annotations.NonNls; @@ -118,7 +119,7 @@ public class DirectoryChooser extends DialogWrapper { }; myView.onSelectionChange(runnable); final JComponent component = myView.getComponent(); - final JScrollPane jScrollPane = new JScrollPane(component); + final JBScrollPane jScrollPane = new JBScrollPane(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 1e01e763f53e..bd9fdc576c8e 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java +++ b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java @@ -32,6 +32,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.ui.ColoredTreeCellRenderer; import com.intellij.ui.NonFocusableCheckBox; 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; @@ -313,7 +314,7 @@ public class MemberChooser extends DialogWrapper implemen } ); TreeUtil.installActions(myTree); - JScrollPane scrollPane = new JScrollPane(myTree); + JBScrollPane scrollPane = new JBScrollPane(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 8f1b0e827bca..67af79a1b2a6 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java @@ -47,6 +47,7 @@ import com.intellij.psi.search.FilenameIndex; import com.intellij.psi.search.GlobalSearchScope; 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; @@ -168,7 +169,7 @@ public final class TreeFileChooserDialog extends DialogWrapper implements TreeFi myTree.setCellRenderer(new NodeRenderer()); UIUtil.setLineStyleAngled(myTree); - final JScrollPane scrollPane = new JScrollPane(myTree); + final JBScrollPane scrollPane = new JBScrollPane(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 51d7de4475f3..8a2b13dddb38 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 @@ -17,7 +17,6 @@ package com.intellij.ide.util.gotoByName; import com.intellij.Patches; -import com.intellij.codeInsight.hint.HintManager; import com.intellij.ide.IdeBundle; import com.intellij.ide.actions.CopyReferenceAction; import com.intellij.ide.ui.UISettings; @@ -50,6 +49,7 @@ import com.intellij.psi.util.proximity.PsiProximityComparator; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.ListScrollingUtil; 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 JScrollPane myListScrollPane; // Located in the layered pane + protected JBScrollPane 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 JScrollPane(myList); + myListScrollPane = new JBScrollPane(myList); if (!UIUtil.isMotifLookAndFeel()) { UIUtil.installPopupMenuBorder(myTextFieldPanel); diff --git a/platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java b/platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java index a107bb1d9691..6ecdeb9bd53f 100644 --- a/platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java +++ b/platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java @@ -40,6 +40,7 @@ import com.intellij.openapi.util.UserDataHolderEx; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.containers.WeakList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -414,7 +415,7 @@ public class EditorWindow implements EditorEx, UserDataHolderEx { return myDelegate.getContentSize(); } - public JScrollPane getScrollPane() { + public JBScrollPane getScrollPane() { return myDelegate.getScrollPane(); } 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 b7d7d8a28a0e..2003ce972c2c 100644 --- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java +++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java @@ -53,6 +53,7 @@ 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; @@ -139,14 +140,14 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider { myTree.addTreeSelectionListener(new MyTreeSelectionListener()); - JScrollPane scrollPane = new JScrollPane(myTree); + JBScrollPane scrollPane = new JBScrollPane(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()); - JScrollPane refScrollPane = new JScrollPane(myRefs); + JBScrollPane refScrollPane = new JBScrollPane(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/diff/impl/settings/DiffOptionsPanel.form b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffOptionsPanel.form index dffb2eb2abf3..da448f48342f 100644 --- a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffOptionsPanel.form +++ b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffOptionsPanel.form @@ -16,7 +16,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/PatternsPanel.form b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/PatternsPanel.form index 9bef20639d86..8f10c89411ba 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/PatternsPanel.form +++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/PatternsPanel.form @@ -8,7 +8,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/RecognizedFileTypes.form b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/RecognizedFileTypes.form index 7b2198f49c8e..e033984fcdb8 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/RecognizedFileTypes.form +++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/RecognizedFileTypes.form @@ -8,7 +8,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/RemoveInvalidElementsDialog.form b/platform/lang-impl/src/com/intellij/openapi/module/impl/RemoveInvalidElementsDialog.form index cb7a48a19d95..2deacec570e2 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/RemoveInvalidElementsDialog.form +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/RemoveInvalidElementsDialog.form @@ -16,7 +16,7 @@ - + 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 6a95caae6da5..36d694b9f6cb 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,6 +42,7 @@ 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; @@ -151,7 +152,7 @@ public class CommonContentEntriesEditor extends ModuleElementsEditor { myEditorsPanel = new ScrollablePanel(new VerticalStackLayout()); myEditorsPanel.setBackground(BACKGROUND_COLOR); - JScrollPane myScrollPane = ScrollPaneFactory.createScrollPane(myEditorsPanel); + JBScrollPane 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 a6326de4eaf0..f506ee62a747 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,6 +42,7 @@ 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; @@ -87,7 +88,7 @@ public class ContentEntryTreeEditor { new TreeSpeedSearch(myTree); myTreePanel = new MyPanel(new BorderLayout()); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); + final JBScrollPane 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 7e32eecabf4a..e49394fab69d 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,6 +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.table.JBTable; import org.jetbrains.annotations.Nullable; @@ -42,11 +43,8 @@ import javax.swing.table.TableColumn; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.image.BufferedImage; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; +import java.util.*; import java.util.List; -import java.util.Map; /** * @author Kirill Kalishev @@ -87,10 +85,10 @@ public class RegistryUi implements Disposable { myDescriptionLabel = new JTextArea(3, 50); myDescriptionLabel.setEditable(false); - final JScrollPane label = new JScrollPane(myDescriptionLabel); + final JBScrollPane label = new JBScrollPane(myDescriptionLabel); label.setBorder(new TitledBorder("Description")); - myContent.add(new JScrollPane(myTable), BorderLayout.CENTER); + myContent.add(new JBScrollPane(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.form b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form index de1068ee952e..09ddcc8e4285 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form +++ b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form @@ -16,7 +16,7 @@ - + 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 46cec76a118e..5ec369d1912e 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,6 +29,7 @@ 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; @@ -43,7 +44,7 @@ import java.util.Map; public class FileEncodingConfigurable implements SearchableConfigurable, NonDefaultProjectConfigurable, OptionalConfigurable { private final Project myProject; private FileTreeTable myTreeView; - private JScrollPane myTreePanel; + private JBScrollPane 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 b48e9f3f2828..37104913f2a6 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java @@ -54,6 +54,7 @@ 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; @@ -760,7 +761,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide pane.setForeground(Color.black); pane.setBackground(HintUtil.INFORMATION_COLOR); pane.setOpaque(true); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(pane); + final JBScrollPane 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 65e9977934f4..aa8a7279f0ab 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,6 +56,7 @@ 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; @@ -429,7 +430,7 @@ public class SingleInspectionProfilePanel extends JPanel { return null; } - private JScrollPane initTreeScrollPane() { + private JBScrollPane initTreeScrollPane() { fillTreeData(null, true); @@ -509,7 +510,7 @@ public class SingleInspectionProfilePanel extends JPanel { myTree.setSelectionModel(new DefaultTreeSelectionModel()); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); + final JBScrollPane 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/AbstactExtractMethodDialog.form b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstactExtractMethodDialog.form index f2bdd1d9517a..a61bd8a2836e 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstactExtractMethodDialog.form +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstactExtractMethodDialog.form @@ -56,7 +56,7 @@ - + @@ -86,7 +86,7 @@ - + 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 8aebfc10315a..ed0433ab3878 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractParameterTablePanel.java +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractParameterTablePanel.java @@ -18,6 +18,7 @@ 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; @@ -146,7 +147,7 @@ public abstract class AbstractParameterTablePanel extends JPanel { }); JPanel listPanel = new JPanel(new BorderLayout()); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); listPanel.add(scrollPane, BorderLayout.CENTER); listPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); add(listPanel, BorderLayout.CENTER); @@ -315,4 +316,4 @@ public abstract class AbstractParameterTablePanel extends JPanel { return super.getColumnClass(columnIndex); } } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.form b/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.form index b565da566097..d27533a97d7e 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.form +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.form @@ -36,7 +36,7 @@ - + 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 40540c941fc6..d7faef78882e 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java @@ -23,6 +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 org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -52,7 +53,7 @@ public class UnsafeUsagesDialog extends DialogWrapper { @NonNls final String contentType = "text/html"; myMessagePane = new JEditorPane(contentType, ""); myMessagePane.setEditable(false); - JScrollPane scrollPane = new JScrollPane(myMessagePane); + JBScrollPane scrollPane = new JBScrollPane(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 de694820c41b..15a891b3f565 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java @@ -29,6 +29,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringBundle; 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; @@ -104,7 +105,7 @@ public class ConflictsDialog extends DialogWrapper{ @NonNls final String contentType = "text/html"; final JEditorPane messagePane = new JEditorPane(contentType, ""); messagePane.setEditable(false); - JScrollPane scrollPane = new JScrollPane(messagePane); + JBScrollPane scrollPane = new JBScrollPane(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 f7b4db66ce11..370c8717ed7b 100644 --- a/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java +++ b/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java @@ -23,6 +23,7 @@ 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; @@ -186,7 +187,7 @@ class OutputFiltersDialog extends DialogWrapper { JPanel panel = new JPanel(new BorderLayout()); - panel.add(new JScrollPane(myFiltersList), BorderLayout.CENTER); + panel.add(new JBScrollPane(myFiltersList), BorderLayout.CENTER); panel.add(myButtonGroup, BorderLayout.EAST); panel.setPreferredSize(new Dimension(400, 200)); @@ -218,4 +219,4 @@ class OutputFiltersDialog extends DialogWrapper { protected String getDimensionServiceKey(){ return "#com.intellij.tools.OutputFiltersDialog"; } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/tools/ToolsPanel.java b/platform/lang-impl/src/com/intellij/tools/ToolsPanel.java index ac40a143d574..5fa053bb171c 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolsPanel.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolsPanel.java @@ -23,6 +23,7 @@ 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; @@ -107,7 +108,7 @@ class ToolsPanel extends JPanel { myTree.setRootVisible(false); - JScrollPane tableScrollPane = ScrollPaneFactory.createScrollPane(myTree); + JBScrollPane 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 85634a6fdd83..8eaccb694e88 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,6 +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.debugger.UiDebuggerExtension; import com.intellij.ui.speedSearch.ElementFilter; import com.intellij.ui.tabs.JBTabs; @@ -133,7 +134,7 @@ public class DisposerDebugger implements UiDebuggerExtension, Disposable { myAllocation.setEditable(false); setLayout(new BorderLayout()); - add(new JScrollPane(myAllocation), BorderLayout.CENTER); + add(new JBScrollPane(myAllocation), BorderLayout.CENTER); treeTabs.addListener(new TabsListener.Adapter() { @@ -240,7 +241,7 @@ public class DisposerDebugger implements UiDebuggerExtension, Disposable { myTree = tree; setLayout(new BorderLayout()); - add(new JScrollPane(myTree), BorderLayout.CENTER); + add(new JBScrollPane(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 24f8e6c3b4c9..c6b65b77c271 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 @@ -24,6 +24,7 @@ import com.intellij.ui.ColoredListCellRenderer; 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.*; @@ -71,8 +72,8 @@ public class FocusDebugger implements UiDebuggerExtension, PropertyChangeListene final Splitter splitter = new Splitter(true); - splitter.setFirstComponent(new JScrollPane(myLog)); - splitter.setSecondComponent(new JScrollPane(myAllocation)); + splitter.setFirstComponent(new JBScrollPane(myLog)); + splitter.setSecondComponent(new JBScrollPane(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 cb7ea867415b..17f0e66a10c1 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 @@ -43,6 +43,7 @@ import com.intellij.openapi.wm.impl.IdeFrameImpl; import com.intellij.ui.ColoredListCellRenderer; 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; @@ -142,11 +143,11 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta //} final Splitter script2Log = new Splitter(true); - script2Log.setFirstComponent(new JScrollPane(myEditor.getComponent())); + script2Log.setFirstComponent(new JBScrollPane(myEditor.getComponent())); myList = new JBList(myMessage); myList.setCellRenderer(new MyListRenderer()); - script2Log.setSecondComponent(new JScrollPane(myList)); + script2Log.setSecondComponent(new JBScrollPane(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 d0bfe1086de0..5fd06aaa5449 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 @@ -5,9 +5,10 @@ package com.intellij.util.ui.classpath; import com.intellij.openapi.Disposable; -import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.ModalityState; +import com.intellij.openapi.actionSystem.ActionManager; +import com.intellij.openapi.actionSystem.ActionPlaces; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.ex.FileChooserDialogImpl; import com.intellij.openapi.project.DumbAwareAction; @@ -32,6 +33,7 @@ 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; @@ -94,7 +96,7 @@ public class SimpleClasspathPanel extends JPanel { } }); add(ActionManager.getInstance().createActionToolbar(ActionPlaces.PROJECT_VIEW_TOOLBAR, actionGroup, true).getComponent(), BorderLayout.NORTH); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); + final JBScrollPane 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.form b/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.form index 3a262f770f00..5b42fc6a24fc 100644 --- a/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.form +++ b/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.form @@ -14,7 +14,7 @@ - + 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 fbebf35b94f6..0faa17749ab6 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,6 +27,7 @@ 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; @@ -50,7 +51,7 @@ public abstract class LanguagePerFileConfigurable implements SearchableConfig private final String myOverrideQuestion; private final String myOverrideTitle; private final AbstractFileTreeTable myTreeView; - private JScrollPane myTreePanel; + private JBScrollPane 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 5507f2a9cef2..a6a50e391829 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,6 +51,7 @@ 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; @@ -208,7 +209,7 @@ public abstract class HistoryDialog extends FrameW toolBarPanel.setPreferredSize(new Dimension(1, prefToolBarSize.height)); } result.add(toolBarPanel, BorderLayout.NORTH); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myRevisionsList.getComponent()); + JBScrollPane 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 e3e6eadca382..c8a3ecbb768d 100644 --- a/platform/platform-api/src/com/intellij/execution/util/ExecutionErrorDialog.java +++ b/platform/platform-api/src/com/intellij/execution/util/ExecutionErrorDialog.java @@ -22,6 +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.util.ui.UIUtil; import javax.swing.*; @@ -54,7 +55,7 @@ public class ExecutionErrorDialog { textArea.setText(message); textArea.setWrapStyleWord(false); textArea.setLineWrap(true); - final JScrollPane scrollPane = new JScrollPane(textArea); + final JBScrollPane scrollPane = new JBScrollPane(textArea); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); final JPanel panel = new JPanel(new BorderLayout(10, 0)); panel.setPreferredSize(new Dimension(500, 200)); @@ -65,4 +66,4 @@ public class ExecutionErrorDialog { builder.addOkAction(); builder.show(); } -} \ No newline at end of file +} 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 fa460f934edc..2e696c6dea5c 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 @@ -27,6 +27,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.ColoredListCellRenderer; 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.*; @@ -116,7 +117,7 @@ public abstract class ContentChooser extends DialogWrapper { }); mySplitter = new Splitter(true); - mySplitter.setFirstComponent(new JScrollPane(myList)); + mySplitter.setFirstComponent(new JBScrollPane(myList)); mySplitter.setSecondComponent(new JPanel()); updateViewerForSelection(); @@ -163,7 +164,7 @@ public abstract class ContentChooser extends DialogWrapper { textArea.setSelectionStart(0); textArea.setSelectionEnd(textArea.getText().length()); textArea.setEditable(false); - mySplitter.setSecondComponent(new JScrollPane(textArea)); + mySplitter.setSecondComponent(new JBScrollPane(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 7707e58c53d4..56a5b223efec 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java @@ -34,6 +34,7 @@ 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; @@ -87,7 +88,7 @@ public abstract class MasterDetailsComponent implements Configurable, Persistent public void queryPlace(@NotNull final Place place) { } }); - private JScrollPane myMaster; + private JBScrollPane myMaster; public void setHistory(final History history) { myHistory = history; @@ -162,7 +163,7 @@ public abstract class MasterDetailsComponent implements Configurable, Persistent }; left.add(myNorthPanel, BorderLayout.NORTH); - myMaster = new JScrollPane(myTree); + myMaster = new JBScrollPane(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 71c391d97f9d..440a6719b4b9 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java @@ -26,6 +26,7 @@ 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; @@ -468,7 +469,7 @@ public class Messages { textArea.setText(textField.getText().replaceAll("[\\ ]*=[\\ ]*", "=").replaceAll(" ", "\n")); InsertPathAction.copyFromTo(textField, textArea); DialogBuilder builder = new DialogBuilder(textField); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(textArea); + JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(textArea); builder.setDimensionServiceKey(dimensionServiceKey); builder.setCenterPanel(scrollPane); builder.setPreferedFocusComponent(textArea); @@ -587,10 +588,10 @@ 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 JScrollPane pane = ScrollPaneFactory.createScrollPane(messageComponent); + final JBScrollPane 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); + pane.setVerticalScrollBarPolicy(JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + pane.setHorizontalScrollBarPolicy(JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); final int scrollSize = (int)new JScrollBar(JScrollBar.VERTICAL).getPreferredSize().getWidth(); final Dimension preferredSize = new Dimension(Math.min(textSize.width, screenSize.width * 4 / 5) + scrollSize, Math.min(textSize.height, screenSize.height/2) + scrollSize); 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 10a96bf1337e..0efc0f027cbb 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/StripeTable.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/StripeTable.java @@ -16,16 +16,17 @@ package com.intellij.openapi.ui; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.Table; -import javax.swing.table.TableModel; +import javax.swing.*; import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; -import javax.swing.*; +import javax.swing.table.TableModel; import java.awt.*; -import java.beans.PropertyChangeListener; import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; /** * @author spleaner @@ -81,8 +82,8 @@ public class StripeTable extends Table { return component; } - public static JScrollPane createScrollPane(JTable table) { - JScrollPane scrollPane = new JScrollPane(table); + public static JBScrollPane createScrollPane(JTable table) { + JBScrollPane scrollPane = new JBScrollPane(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 30b5d03577c9..61eab94d198e 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.components.JBScrollPane; import com.intellij.ui.speedSearch.ListWithFilter; import com.intellij.ui.treeStructure.treetable.TreeTable; import com.intellij.util.Function; @@ -202,7 +203,7 @@ public class PopupChooserBuilder { registerClosePopupKeyboardAction(keystroke, true); } - final JScrollPane scrollPane; + final JBScrollPane scrollPane; if (myChooserComponent instanceof ListWithFilter) { scrollPane = ((ListWithFilter)myChooserComponent).getScrollPane(); } @@ -294,12 +295,12 @@ public class PopupChooserBuilder { } @NotNull - private JScrollPane createScrollPane(final JTable table) { + private JBScrollPane createScrollPane(final JTable table) { if (table instanceof TreeTable) { TreeUtil.expandAll(((TreeTable)table).getTree()); } - JScrollPane scrollPane = new JScrollPane(table); + JBScrollPane scrollPane = new JBScrollPane(table); scrollPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); @@ -333,10 +334,10 @@ public class PopupChooserBuilder { } @NotNull - private JScrollPane createScrollPane(final JTree tree) { + private JBScrollPane createScrollPane(final JTree tree) { TreeUtil.expandAll(tree); - JScrollPane scrollPane = new JScrollPane(tree); + JBScrollPane scrollPane = new JBScrollPane(tree); scrollPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); @@ -394,7 +395,7 @@ public class PopupChooserBuilder { return this; } - private class MyListWrapper extends JScrollPane implements DataProvider { + private class MyListWrapper extends JBScrollPane implements DataProvider { @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) private final JList myList; diff --git a/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java b/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java index 6703c357a7f8..5519127add1b 100644 --- a/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java +++ b/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java @@ -22,6 +22,7 @@ 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.*; @@ -209,7 +210,7 @@ public abstract class AbstractFieldPanel extends JPanel { } }.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)), myTextArea); - return new JScrollPane(myTextArea); + return new JBScrollPane(myTextArea); } } } diff --git a/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form b/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form index 8bebb6b2da4d..e5fb374a0e32 100644 --- a/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form +++ b/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form @@ -8,7 +8,7 @@ - + diff --git a/platform/platform-api/src/com/intellij/ui/PathsChooserComponent.form b/platform/platform-api/src/com/intellij/ui/PathsChooserComponent.form index 8986770db2e0..dc9f5a6dcf83 100644 --- a/platform/platform-api/src/com/intellij/ui/PathsChooserComponent.form +++ b/platform/platform-api/src/com/intellij/ui/PathsChooserComponent.form @@ -13,7 +13,7 @@ - + diff --git a/platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java b/platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java index 38acce0c509b..8f6fbde71b6e 100644 --- a/platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java +++ b/platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java @@ -15,6 +15,8 @@ */ package com.intellij.ui; +import com.intellij.ui.components.JBScrollPane; + import javax.swing.*; /** @@ -24,11 +26,11 @@ public class ScrollPaneFactory { private ScrollPaneFactory() { } - public static JScrollPane2 createScrollPane() { - return new JScrollPane2(); + public static JBScrollPane createScrollPane() { + return new JBScrollPane(); } - public static JScrollPane createScrollPane(JComponent view) { - return new JScrollPane2(view); + public static JBScrollPane createScrollPane(JComponent view) { + return new JBScrollPane(view); } } diff --git a/platform/platform-api/src/com/intellij/ui/JScrollPane2.java b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java similarity index 71% rename from platform/platform-api/src/com/intellij/ui/JScrollPane2.java rename to platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java index e9b5b4f059f0..760e5bb9b937 100644 --- a/platform/platform-api/src/com/intellij/ui/JScrollPane2.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.ui; +package com.intellij.ui.components; + +import com.intellij.util.ui.ButtonlessScrollBarUI; import javax.swing.*; import javax.swing.plaf.ScrollPaneUI; @@ -22,12 +24,21 @@ import java.awt.*; /** * @author Vladimir Kondratyev */ -public class JScrollPane2 extends JScrollPane { - JScrollPane2(JComponent view) { +public class JBScrollPane extends JScrollPane { + public JBScrollPane(Component view) { super(view); } - protected JScrollPane2() { + public JBScrollPane() { + } + + public JBScrollPane(int vsbPolicy, int hsbPolicy) { + super(vsbPolicy, hsbPolicy); + } + + + public JBScrollPane(Component view, int vsbPolicy, int hsbPolicy) { + super(view, vsbPolicy, hsbPolicy); } /** @@ -47,6 +58,9 @@ public class JScrollPane2 extends JScrollPane { } } }); + + getVerticalScrollBar().setUI(ButtonlessScrollBarUI.createNormal()); + getHorizontalScrollBar().setUI(ButtonlessScrollBarUI.createNormal()); } } 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 3d9e368db685..e9b1a6f81b87 100644 --- a/platform/platform-api/src/com/intellij/ui/speedSearch/ListWithFilter.java +++ b/platform/platform-api/src/com/intellij/ui/speedSearch/ListWithFilter.java @@ -21,6 +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.util.Function; import javax.swing.*; @@ -32,22 +33,22 @@ public class ListWithFilter extends JPanel { private final JList myList; private final JTextField mySpeedSearchPatternField; private final NameFilteringListModel myModel; - private final JScrollPane myScroller; + private final JBScrollPane myScroller; private final MySpeedSearch mySpeedSearch; public static JComponent wrap(JList list) { - return wrap(list, new JScrollPane(list), new Function() { + return wrap(list, new JBScrollPane(list), new Function() { public String fun(Object o) { return o.toString(); } }); } - public static JComponent wrap(JList list, JScrollPane scroller, Function namer) { + public static JComponent wrap(JList list, JBScrollPane scroller, Function namer) { return new ListWithFilter(list, scroller, namer); } - private ListWithFilter(JList list, JScrollPane scroller, Function namer) { + private ListWithFilter(JList list, JBScrollPane scroller, Function namer) { super(new BorderLayout()); myList = list; @@ -126,7 +127,7 @@ public class ListWithFilter extends JPanel { return myList; } - public JScrollPane getScrollPane() { + public JBScrollPane getScrollPane() { return myScroller; } 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 27ee8512c15f..1148eb0737d4 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 @@ -15,11 +15,11 @@ */ package com.intellij.ui.tabs.impl; -import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.IconLoader; 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 JScrollPane(text)).setSideComponent(tb)).setText("Text text text"); + tabs.addTab(new TabInfo(new JBScrollPane(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 9afe51e4e669..fa06df47e175 100644 --- a/platform/platform-impl/src/com/intellij/application/options/SelectFontDialog.java +++ b/platform/platform-impl/src/com/intellij/application/options/SelectFontDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.ListScrollingUtil; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.containers.HashMap; import javax.swing.*; @@ -82,7 +83,7 @@ public class SelectFontDialog extends DialogWrapper { JPanel panel = new JPanel(new BorderLayout()); panel.add(myShowMonospacedCheckbox, BorderLayout.NORTH); - panel.add(new JScrollPane(myFontList), BorderLayout.CENTER); + panel.add(new JBScrollPane(myFontList), BorderLayout.CENTER); SwingUtilities.invokeLater(new Runnable() { public void run() { diff --git a/platform/platform-impl/src/com/intellij/application/options/ShareSchemePanel.form b/platform/platform-impl/src/com/intellij/application/options/ShareSchemePanel.form index 9a3d50b54c68..e1082de419f1 100644 --- a/platform/platform-impl/src/com/intellij/application/options/ShareSchemePanel.form +++ b/platform/platform-impl/src/com/intellij/application/options/ShareSchemePanel.form @@ -33,7 +33,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form index d46f9a5c3067..7f7c4ab2c5bd 100644 --- a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form +++ b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form @@ -8,7 +8,7 @@ - + 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 4402e1531ba4..cb5f6d9f1560 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,6 +19,7 @@ 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.*; @@ -36,7 +37,7 @@ public class PathMacroListEditor { JButton myAddButton; JButton myRemoveButton; JButton myEditButton; - JScrollPane myScrollPane; + JBScrollPane 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 e6ed3096f99f..2c3685f425e8 100644 --- a/platform/platform-impl/src/com/intellij/codeInsight/hint/LineTooltipRenderer.java +++ b/platform/platform-impl/src/com/intellij/codeInsight/hint/LineTooltipRenderer.java @@ -27,6 +27,7 @@ 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; @@ -75,7 +76,7 @@ public class LineTooltipRenderer implements TooltipRenderer { int widthLimit = layeredPane.getWidth() - 10; int heightLimit = layeredPane.getHeight() - 5; - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(pane); + final JBScrollPane 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/EAPSendErrorForm.form b/platform/platform-impl/src/com/intellij/diagnostic/EAPSendErrorForm.form index 486af37f91d9..42b6c6e1f60c 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/EAPSendErrorForm.form +++ b/platform/platform-impl/src/com/intellij/diagnostic/EAPSendErrorForm.form @@ -16,7 +16,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java index 6becee692f2e..428d14cb62e2 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java @@ -45,6 +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.util.text.DateFormatUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -310,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 JScrollPane(myDetailsPane), BorderLayout.CENTER); + infoPanel.add(new JBScrollPane(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 fc096e786baa..fa91898890ab 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java +++ b/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java @@ -23,6 +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 javax.swing.*; import java.awt.*; @@ -61,7 +62,7 @@ public class AdaptiveTipDialog extends DialogWrapper { myBrowser = new JEditorPane("text/html", ""); - panel.add(new JScrollPane(myBrowser)); + panel.add(new JBScrollPane(myBrowser)); panel.setPreferredSize(new Dimension(DEFAULT_WIDTH, DEFAULT_HEIGHT)); return panel; } diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.form b/platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.form index ddd295244b5d..49630c46dc0c 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.form +++ b/platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.form @@ -56,7 +56,7 @@ - + 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 23eccdcf10eb..e0bb799c183c 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.java +++ b/platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.java @@ -26,6 +26,7 @@ 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; @@ -54,7 +55,7 @@ public class ProgressTipPanel { private Runnable myLastRequest; private JButton myCloseButton; private JCheckBox myKeepOpen; - private JScrollPane myScrollPane; + private JBScrollPane 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/actionMacro/EditMacrosConfiguration.form b/platform/platform-impl/src/com/intellij/ide/actionMacro/EditMacrosConfiguration.form index 2fdf6f3f7786..217438fd642c 100644 --- a/platform/platform-impl/src/com/intellij/ide/actionMacro/EditMacrosConfiguration.form +++ b/platform/platform-impl/src/com/intellij/ide/actionMacro/EditMacrosConfiguration.form @@ -9,7 +9,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeRenderer.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeRenderer.java index 99a2a9f32f28..3965435c7f6b 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeRenderer.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeRenderer.java @@ -21,6 +21,7 @@ import com.intellij.openapi.vcs.changes.issueLinks.TreeNodePartListener; import com.intellij.ui.CustomizeColoredTreeCellRenderer; import com.intellij.ui.MultilineTreeCellRenderer; import com.intellij.ui.SimpleColoredComponent; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -49,7 +50,7 @@ public class NewErrorTreeRenderer extends MultilineTreeCellRenderer { myWrapperRenderer = new MyWrapperRenderer(myColoredTreeCellRenderer, myRightCellRenderer); } - public static JScrollPane install(JTree tree) { + public static JBScrollPane install(JTree tree) { final NewErrorTreeRenderer renderer = new NewErrorTreeRenderer(); //new TreeLinkMouseListener(renderer.myColoredTreeCellRenderer).install(tree); new TreeNodePartListener(renderer.myRightCellRenderer).install(tree); 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 d2ec4fb49caa..f269940e88fe 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java @@ -30,6 +30,7 @@ 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; @@ -131,7 +132,7 @@ public class NewErrorTreeViewPanel extends JPanel implements DataProvider, Occur myTree.setShowsRootHandles(true); myTree.setLargeModel(true); - JScrollPane scrollPane = NewErrorTreeRenderer.install(myTree); + JBScrollPane 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 d119fee983bb..db4b9e75d91d 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 @@ -26,6 +26,7 @@ import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ListUtil; import com.intellij.ui.TabbedPaneWrapper; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import javax.swing.*; import java.awt.*; @@ -238,7 +239,7 @@ public class CustomFileTypeEditor extends SettingsEditor { JPanel keywordsPanel = panel; keywordsPanel.setLayout(new BorderLayout()); - keywordsPanel.add(new JScrollPane(myKeywordsLists[index]), BorderLayout.CENTER); + keywordsPanel.add(new JBScrollPane(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.form b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form index f75d95cb2dc3..48f93a647cd8 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form @@ -118,7 +118,7 @@ - + @@ -147,7 +147,7 @@ - + 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 b043800ecfc9..bd67f2f0fae8 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java @@ -33,6 +33,7 @@ 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; @@ -113,7 +114,7 @@ public class PluginManagerMain implements Disposable { installedPluginTable.setColumnWidth(2, 45); - JScrollPane installedScrollPane = ScrollPaneFactory.createScrollPane(installedPluginTable); + JBScrollPane installedScrollPane = ScrollPaneFactory.createScrollPane(installedPluginTable); installedPluginTable.registerKeyboardAction(new ActionListener() { public void actionPerformed(ActionEvent e) { final int column = InstalledPluginsTableModel.getCheckboxColumn(); @@ -136,7 +137,7 @@ public class PluginManagerMain implements Disposable { availablePluginsTable = new PluginTable(availablePluginsModel); // Downloads availablePluginsTable.setColumnWidth(1, 70); - JScrollPane availableScrollPane = ScrollPaneFactory.createScrollPane(availablePluginsTable); + JBScrollPane availableScrollPane = ScrollPaneFactory.createScrollPane(availablePluginsTable); installTableActions(installedPluginTable); installTableActions(availablePluginsTable); diff --git a/platform/platform-impl/src/com/intellij/ide/startupWizard/SelectPluginsStep.form b/platform/platform-impl/src/com/intellij/ide/startupWizard/SelectPluginsStep.form index 5c33c4081077..a2be296736c1 100644 --- a/platform/platform-impl/src/com/intellij/ide/startupWizard/SelectPluginsStep.form +++ b/platform/platform-impl/src/com/intellij/ide/startupWizard/SelectPluginsStep.form @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.form b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.form index 49e56e3fccc1..5b0b02e62987 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.form +++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.form @@ -16,7 +16,7 @@ - + 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 d505e1c0a5bd..15fc447258f9 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/ElementsChooser.java +++ b/platform/platform-impl/src/com/intellij/ide/util/ElementsChooser.java @@ -18,6 +18,7 @@ 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; @@ -63,7 +64,7 @@ public class ElementsChooser extends JPanel { myTable.setTableHeader(null); myTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN); myTable.setColumnSelectionAllowed(false); - JScrollPane pane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane 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 50aef0620630..a02339ef6f81 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java @@ -27,6 +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.util.SystemProperties; import javax.swing.*; @@ -105,7 +106,7 @@ public class ExportToFileUtil { private final Project myProject; private final ExporterToTextFile myExporter; protected JTextArea myTextArea; - protected JScrollPane myTextScrollPane; + protected JBScrollPane myTextScrollPane; protected JTextField myTfFile; protected JButton myFileButton; private ChangeListener myListener; @@ -150,7 +151,7 @@ public class ExportToFileUtil { protected JComponent createCenterPanel() { myTextArea = new JTextArea(); myTextArea.setEditable(false); - myTextScrollPane = new JScrollPane(myTextArea); + myTextScrollPane = new JBScrollPane(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 7ae8551023e4..f8ef53669f7f 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java @@ -24,6 +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 org.jdom.Document; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -78,7 +79,7 @@ public class TipPanel extends JPanel { } } ); - JScrollPane scrollPane = new JScrollPane(browser); + JBScrollPane scrollPane = new JBScrollPane(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/internal/encodings/ClasspathList.form b/platform/platform-impl/src/com/intellij/internal/encodings/ClasspathList.form index 76e718c34d96..f63d025861c6 100644 --- a/platform/platform-impl/src/com/intellij/internal/encodings/ClasspathList.form +++ b/platform/platform-impl/src/com/intellij/internal/encodings/ClasspathList.form @@ -36,7 +36,7 @@ - + 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 5fc3feff51ec..e07e73280774 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 @@ -27,6 +27,7 @@ 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.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; @@ -594,9 +595,9 @@ 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 JScrollPane scrollPane = new JScrollPane(list); - scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + final JBScrollPane scrollPane = new JBScrollPane(list); + scrollPane.setHorizontalScrollBarPolicy(JBScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setVerticalScrollBarPolicy(JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); scrollPane.setBorder(null); scrollPane.getViewport().setBackground(UIUtil.getPanelBackgound()); diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.form b/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.form index 66ded1c4f427..6bc00c34dd1b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.form +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.form @@ -24,7 +24,7 @@ - + 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 d57e1cfb1dc5..85ac3a2d2c51 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 @@ -26,10 +26,10 @@ import com.intellij.openapi.editor.highlighter.EditorHighlighter; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.components.JBScrollPane; 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; @@ -93,7 +93,7 @@ public interface EditorEx extends Editor { void setOneLineMode(boolean b); - JScrollPane getScrollPane(); + JBScrollPane getScrollPane(); boolean isRendererMode(); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java index c248ae8c5f61..7c887bb00adf 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java @@ -31,6 +31,7 @@ import com.intellij.openapi.keymap.ex.KeymapManagerEx; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.impl.http.HttpVirtualFile; +import com.intellij.ui.components.JBScrollPane; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,7 +60,7 @@ public class ContextMenuImpl extends JPanel implements Disposable { private boolean myDisposed; private final JLayeredPane myLayeredPane; - public ContextMenuImpl(JLayeredPane layeredPane, @NotNull final JScrollPane container, @NotNull final EditorImpl editor) { + public ContextMenuImpl(JLayeredPane layeredPane, @NotNull final JBScrollPane container, @NotNull final EditorImpl editor) { setLayout(new BorderLayout(0, 0)); myEditor = editor; myLayeredPane = layeredPane; @@ -99,7 +100,7 @@ public class ContextMenuImpl extends JPanel implements Disposable { setOpaque(false); } - private static boolean isInsideActivationArea(JScrollPane container, Point p) { + private static boolean isInsideActivationArea(JBScrollPane container, Point p) { final JViewport viewport = container.getViewport(); final Rectangle r = viewport.getBounds(); final Point viewPosition = viewport.getViewPosition(); 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 306fc7d42b00..d2290d2c8a75 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 @@ -58,8 +58,8 @@ import com.intellij.openapi.util.*; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.GuiUtils; -import com.intellij.ui.JScrollPane2; import com.intellij.ui.LightweightHint; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Alarm; import com.intellij.util.IJSwingUtilities; import com.intellij.util.containers.ContainerUtil; @@ -110,7 +110,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi private final DocumentImpl myDocument; private final JPanel myPanel; - private final JScrollPane myScrollPane; + private final JBScrollPane 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 JScrollPane) { + if (c instanceof JBScrollPane) { c.setBounds(0, 0, r.width, r.height); } else { @@ -2382,7 +2382,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi return new Dimension(size.width, size.height + mySettings.getAdditionalLinesCount() * getLineHeight()); } - public JScrollPane getScrollPane() { + public JBScrollPane getScrollPane() { return myScrollPane; } @@ -4674,7 +4674,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi info.put("caret", visual.getLine() + ":" + visual.getColumn()); } - private class MyScrollPane extends JScrollPane2 { + private class MyScrollPane extends JBScrollPane { protected void processMouseWheelEvent(MouseWheelEvent e) { if (mySettings.isWheelFontChangeEnabled()) { boolean changeFontSize = SystemInfo.isMac 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 9145e2e61c7b..6e7f11085f2e 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,6 +15,8 @@ */ package com.intellij.openapi.editor.impl; +import com.intellij.ui.components.JBScrollPane; + import javax.swing.*; import javax.swing.border.Border; import java.awt.*; @@ -30,7 +32,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The scrollpane's viewport child. * Default is an empty JViewport. * - * @see JScrollPane#setViewport + * @see com.intellij.ui.components.JBScrollPane#setViewport */ protected JViewport viewport; @@ -39,7 +41,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The scrollpane's vertical scrollbar child. * Default is a JScrollBar. * - * @see JScrollPane#setVerticalScrollBar + * @see com.intellij.ui.components.JBScrollPane#setVerticalScrollBar */ protected JScrollBar vsb; @@ -48,7 +50,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The scrollpane's horizontal scrollbar child. * Default is a JScrollBar. * - * @see JScrollPane#setHorizontalScrollBar + * @see com.intellij.ui.components.JBScrollPane#setHorizontalScrollBar */ protected JScrollBar hsb; @@ -56,7 +58,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { /** * The row header child. Default is null. * - * @see JScrollPane#setRowHeader + * @see com.intellij.ui.components.JBScrollPane#setRowHeader */ protected JViewport rowHead; @@ -64,7 +66,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { /** * The column header child. Default is null. * - * @see JScrollPane#setColumnHeader + * @see com.intellij.ui.components.JBScrollPane#setColumnHeader */ protected JViewport colHead; @@ -73,7 +75,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The component to display in the lower left corner. * Default is null. * - * @see JScrollPane#setCorner + * @see com.intellij.ui.components.JBScrollPane#setCorner */ protected Component lowerLeft; @@ -82,7 +84,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The component to display in the lower right corner. * Default is null. * - * @see JScrollPane#setCorner + * @see com.intellij.ui.components.JBScrollPane#setCorner */ protected Component lowerRight; @@ -91,7 +93,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The component to display in the upper left corner. * Default is null. * - * @see JScrollPane#setCorner + * @see com.intellij.ui.components.JBScrollPane#setCorner */ protected Component upperLeft; @@ -100,7 +102,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * The component to display in the upper right corner. * Default is null. * - * @see JScrollPane#setCorner + * @see com.intellij.ui.components.JBScrollPane#setCorner */ protected Component upperRight; @@ -111,7 +113,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { *

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

* This field is obsolete, please use the JScrollPane field instead. * - * @see JScrollPane#setHorizontalScrollBarPolicy + * @see com.intellij.ui.components.JBScrollPane#setHorizontalScrollBarPolicy */ protected int hsbPolicy = HORIZONTAL_SCROLLBAR_AS_NEEDED; @@ -142,7 +144,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * scrollpane.setLayout(mySPLayout): * */ - public void syncWithScrollPane(JScrollPane sp) { + public void syncWithScrollPane(JBScrollPane sp) { viewport = sp.getViewport(); vsb = sp.getVerticalScrollBar(); hsb = sp.getHorizontalScrollBar(); @@ -350,7 +352,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * scrollable contents. * * @return the JViewport object that displays the scrollable contents - * @see JScrollPane#getViewport + * @see com.intellij.ui.components.JBScrollPane#getViewport */ public JViewport getViewport() { return viewport; @@ -361,7 +363,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * Returns the JScrollBar object that handles horizontal scrolling. * * @return the JScrollBar object that handles horizontal scrolling - * @see JScrollPane#getHorizontalScrollBar + * @see com.intellij.ui.components.JBScrollPane#getHorizontalScrollBar */ public JScrollBar getHorizontalScrollBar() { return hsb; @@ -371,7 +373,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * Returns the JScrollBar object that handles vertical scrolling. * * @return the JScrollBar object that handles vertical scrolling - * @see JScrollPane#getVerticalScrollBar + * @see com.intellij.ui.components.JBScrollPane#getVerticalScrollBar */ public JScrollBar getVerticalScrollBar() { return vsb; @@ -382,7 +384,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 JScrollPane#getRowHeader + * @see com.intellij.ui.components.JBScrollPane#getRowHeader */ public JViewport getRowHeader() { return rowHead; @@ -393,7 +395,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 JScrollPane#getColumnHeader + * @see com.intellij.ui.components.JBScrollPane#getColumnHeader */ public JViewport getColumnHeader() { return colHead; @@ -407,7 +409,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 JScrollPane#getCorner + * @see com.intellij.ui.components.JBScrollPane#getCorner */ public Component getCorner(String key) { if (key.equals(LOWER_LEFT_CORNER)) { @@ -447,7 +449,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { /* Sync the (now obsolete) policy fields with the * JScrollPane. */ - JScrollPane scrollPane = (JScrollPane)parent; + JBScrollPane scrollPane = (JBScrollPane)parent; vsbPolicy = scrollPane.getVerticalScrollBarPolicy(); hsbPolicy = scrollPane.getHorizontalScrollBarPolicy(); @@ -565,7 +567,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { /* Sync the (now obsolete) policy fields with the * JScrollPane. */ - JScrollPane scrollPane = (JScrollPane)parent; + JBScrollPane scrollPane = (JBScrollPane)parent; vsbPolicy = scrollPane.getVerticalScrollBarPolicy(); hsbPolicy = scrollPane.getHorizontalScrollBarPolicy(); @@ -665,7 +667,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { /* Sync the (now obsolete) policy fields with the * JScrollPane. */ - JScrollPane scrollPane = (JScrollPane)parent; + JBScrollPane scrollPane = (JBScrollPane)parent; vsbPolicy = scrollPane.getVerticalScrollBarPolicy(); hsbPolicy = scrollPane.getHorizontalScrollBarPolicy(); @@ -1048,7 +1050,7 @@ public class LeftHandScrollbarLayout extends ScrollPaneLayout { * @deprecated As of JDK version Swing1.1 * replaced by JScrollPane.getViewportBorderBounds(). */ - public Rectangle getViewportBorderBounds(JScrollPane scrollpane) { + public Rectangle getViewportBorderBounds(JBScrollPane scrollpane) { return scrollpane.getViewportBorderBounds(); } 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 da0a0929cb8e..a5f299b274ed 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 @@ -31,11 +31,12 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.LogicalPosition; import com.intellij.openapi.editor.ScrollType; import com.intellij.openapi.editor.ScrollingModel; -import com.intellij.openapi.editor.ex.util.EditorUtil; import com.intellij.openapi.editor.event.DocumentAdapter; 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; @@ -198,7 +199,7 @@ public class ScrollingModelImpl implements ScrollingModel { } } - JScrollPane scrollPane = myEditor.getScrollPane(); + JBScrollPane 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 3962b56a8c3f..7a3d0a314e0d 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 @@ -35,6 +35,7 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; 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; @@ -199,7 +200,7 @@ public class FileChooserDialogImpl extends DialogWrapper implements FileChooserD registerMouseListener(group); - JScrollPane scrollPane = new JScrollPane(myFileSystemTree.getTree()); + JBScrollPane scrollPane = new JBScrollPane(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/fileTypes/ex/FileTypeChooserPanel.form b/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeChooserPanel.form index 4ca9be8382ea..ffd0443b9e8b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeChooserPanel.form +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeChooserPanel.form @@ -33,7 +33,7 @@ - + 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 30531a735a3a..b9d43775f845 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,6 +29,7 @@ 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; @@ -55,7 +56,7 @@ public class ActionsTree { private final JTree myTree; private DefaultMutableTreeNode myRoot; - private final JScrollPane myComponent; + private final JBScrollPane 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 bcc340c7c5dd..0e6f27403b35 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,6 +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.util.ArrayUtil; import com.intellij.util.ui.UIUtil; @@ -114,7 +115,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { myConflictInfoArea.setBackground(panel.getBackground()); myConflictInfoArea.setLineWrap(true); myConflictInfoArea.setWrapStyleWord(true); - final JScrollPane conflictInfoScroll = new JScrollPane(myConflictInfoArea); + final JBScrollPane conflictInfoScroll = new JBScrollPane(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 7bd281f53693..b5dec298f828 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,6 +44,7 @@ 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; @@ -232,7 +233,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable { myShortcutsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myShortcutsList.setCellRenderer(new ShortcutListRenderer()); currentKeysLabel.setLabelFor(myShortcutsList); - JScrollPane scrollPane = new JScrollPane(myShortcutsList); + JBScrollPane scrollPane = new JBScrollPane(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 5176e9578c9b..c4dbde307958 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,6 +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.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; @@ -178,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)); - JScrollPane scrollPane=new JScrollPane(myTarConflicts); + JBScrollPane scrollPane=new JBScrollPane(myTarConflicts); scrollPane.setBorder(null); conflictsPanel.add( scrollPane, diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.form b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.form index 497eb75cfebf..df9940a46074 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.form +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.form @@ -58,7 +58,7 @@ - + @@ -117,7 +117,7 @@ - + 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 93465b29aa45..1195bbfcdbb9 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,6 +38,7 @@ 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; @@ -67,7 +68,7 @@ public class QuickListsPanel extends JPanel implements SearchableConfigurable, M private final KeymapPanel myKeymapPanel; private JComponent myToolbar; private DetailsComponent myDetailsComponent; - private JScrollPane myListScrollPane; + private JBScrollPane 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 7eed30580278..9ee6a40d0594 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 @@ -28,7 +28,10 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.help.HelpManager; -import com.intellij.openapi.options.*; +import com.intellij.openapi.options.Configurable; +import com.intellij.openapi.options.ConfigurableGroup; +import com.intellij.openapi.options.OptionsBundle; +import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.VerticalFlowLayout; @@ -40,6 +43,7 @@ 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; @@ -128,7 +132,7 @@ public class ControlPanelSettingsEditor extends DialogWrapper { new Insets(0, 0, 0, 0), 0, 0)); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(panel); + JBScrollPane 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 1181f92cbfab..bccb703f43c1 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,6 +38,7 @@ 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; @@ -263,7 +264,7 @@ public class ExplorerSettingsEditor extends DialogWrapper { initTree(); initToolbar(); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); + final JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); @@ -281,7 +282,7 @@ public class ExplorerSettingsEditor extends DialogWrapper { myOptionsPanel.setBorder(BorderFactory.createEmptyBorder(15, 5, 2, 5)); - JScrollPane optionsScrollForTinyScreens = new JScrollPane(myOptionsPanel); + JBScrollPane optionsScrollForTinyScreens = new JBScrollPane(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 0f5a67f23b3b..311aded2cb00 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 @@ -36,6 +36,7 @@ import com.intellij.openapi.util.EdtRunnable; import com.intellij.openapi.wm.IdeGlassPaneUtil; import com.intellij.ui.LightColors; 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; @@ -582,7 +583,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat if (c != null) { if (scrollable) { - JScrollPane scroll = new JScrollPane(c); + JBScrollPane scroll = new JBScrollPane(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 f78bf6fd338b..88833b0f341e 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 @@ -28,6 +28,7 @@ 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.components.panels.NonOpaquePanel; import com.intellij.ui.treeStructure.*; import com.intellij.ui.treeStructure.filtered.FilteringTreeBuilder; @@ -114,7 +115,7 @@ public class OptionsTree extends JPanel implements Disposable, OptionsEditorColl } }); - final JScrollPane scrolls = new JScrollPane(myTree); + final JBScrollPane scrolls = new JBScrollPane(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 bea7143c7b50..d1b7aab4950b 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,6 +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.util.ui.Table; import gnu.trove.TObjectIntHashMap; @@ -80,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 JScrollPane(table), BorderLayout.CENTER); + panel.add(new JBScrollPane(table), BorderLayout.CENTER); return panel; } diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NoUpdatesPanel.form b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NoUpdatesPanel.form index 98c5fd86a38e..3630f21980a5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NoUpdatesPanel.form +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NoUpdatesPanel.form @@ -27,7 +27,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form index 445c5feb1275..74c3bb600eef 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form @@ -144,7 +144,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadOnlyStatusDialog.form b/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadOnlyStatusDialog.form index 4e6bfd54aa56..d3d42d7295c9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadOnlyStatusDialog.form +++ b/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadOnlyStatusDialog.form @@ -8,7 +8,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChooseEncodingDialog.form b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChooseEncodingDialog.form index df4918ee86d0..d7452b858d16 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChooseEncodingDialog.form +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChooseEncodingDialog.form @@ -8,7 +8,7 @@ - + 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 92ffabc0ec7e..28eb442722fb 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 @@ -21,6 +21,7 @@ import com.intellij.openapi.ui.popup.*; import com.intellij.openapi.ui.popup.util.MinimizeButton; import com.intellij.openapi.wm.IdeFrame; import com.intellij.openapi.wm.ex.StatusBarEx; +import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.panels.VerticalBox; import com.intellij.ui.components.panels.Wrapper; import com.intellij.util.ArrayUtil; @@ -168,7 +169,7 @@ public class ProcessPopup { myActiveFocusedContent.add(wrapper, BorderLayout.CENTER); - final JScrollPane scrolls = new JScrollPane(myActiveFocusedContent) { + final JBScrollPane 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 80fa106236c4..0acd77287d2d 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,6 +32,7 @@ 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; @@ -265,13 +266,13 @@ public class WelcomeScreen { myMainPanel.add(quickStartPanel); myMainPanel.add(docsPanel); - JScrollPane myMainScrollPane = new JScrollPane(myMainPanel); + JBScrollPane myMainScrollPane = new JBScrollPane(myMainPanel); myMainScrollPane.setBorder(null); - myMainScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); - myMainScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + myMainScrollPane.setHorizontalScrollBarPolicy(JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + myMainScrollPane.setVerticalScrollBarPolicy(JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); // Create Plugins Panel - JScrollPane myPluginsScrollPane = createPluginsPanel(); + JBScrollPane 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); @@ -332,7 +333,7 @@ public class WelcomeScreen { return topPanel; } - private JScrollPane createPluginsPanel() { + private JBScrollPane createPluginsPanel() { myPluginsPanel = new WelcomeScrollablePanel(new GridBagLayout()); myPluginsPanel.setBackground(PLUGINS_PANEL_COLOR); @@ -416,10 +417,10 @@ 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); - JScrollPane myPluginsScrollPane = ScrollPaneFactory.createScrollPane(myPluginsPanel); + JBScrollPane 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); + myPluginsScrollPane.setHorizontalScrollBarPolicy(JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + myPluginsScrollPane.setVerticalScrollBarPolicy(JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); return myPluginsScrollPane; } diff --git a/platform/platform-impl/src/com/intellij/platform/FilesystemToolwindow.java b/platform/platform-impl/src/com/intellij/platform/FilesystemToolwindow.java index a956b93cba19..e0a89ddca3e6 100644 --- a/platform/platform-impl/src/com/intellij/platform/FilesystemToolwindow.java +++ b/platform/platform-impl/src/com/intellij/platform/FilesystemToolwindow.java @@ -30,6 +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.content.Content; import com.intellij.ui.content.ContentFactory; import com.intellij.ui.content.ContentFactoryImpl; @@ -59,7 +60,7 @@ public class FilesystemToolwindow { descriptor.addRoot(myRoot); myFsTree = new FileSystemTreeImpl(project, descriptor); - myContent.add(new JScrollPane(myFsTree.getTree()), BorderLayout.CENTER); + myContent.add(new JBScrollPane(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 aa2ccac4e132..396316126ca7 100644 --- a/platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java +++ b/platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java @@ -15,6 +15,7 @@ */ package com.intellij.ui; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -378,10 +379,10 @@ public abstract class MultilineTreeCellRenderer extends JComponent implements Tr return this; } - public static JScrollPane installRenderer(final JTree tree, final MultilineTreeCellRenderer renderer) { + public static JBScrollPane installRenderer(final JTree tree, final MultilineTreeCellRenderer renderer) { final TreeCellRenderer defaultRenderer = tree.getCellRenderer(); - JScrollPane scrollpane = new JScrollPane(tree){ + JBScrollPane scrollpane = new JBScrollPane(tree){ private int myAddRemoveCounter = 0; private boolean myShouldResetCaches = false; public void setSize(Dimension d) { @@ -412,8 +413,8 @@ public abstract class MultilineTreeCellRenderer extends JComponent implements Tr myAddRemoveCounter--; } }; - scrollpane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); - scrollpane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); + scrollpane.setHorizontalScrollBarPolicy(JBScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); + scrollpane.setVerticalScrollBarPolicy(JBScrollPane.VERTICAL_SCROLLBAR_ALWAYS); tree.setCellRenderer(renderer); 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 ced5e7cbff02..e4e695bb4243 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,6 +15,7 @@ */ package com.intellij.ui.plaf.beg; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -113,7 +114,7 @@ public class BegBorders { public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { - JScrollPane scroll = (JScrollPane) c; + JBScrollPane scroll = (JBScrollPane) 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 d63c81be8fe4..1a9328d2127a 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java @@ -25,6 +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.popup.list.ListPopupImpl; import com.intellij.ui.popup.tree.TreePopupImpl; import com.intellij.ui.popup.util.MnemonicsSearch; @@ -75,7 +76,7 @@ public abstract class WizardPopup extends AbstractPopup implements ActionListene final JComponent content = createContent(); - JScrollPane scrollPane = new JScrollPane(content); + JBScrollPane scrollPane = new JBScrollPane(content); scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.getHorizontalScrollBar().setBorder(null); @@ -289,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 JScrollPane().getVerticalScrollBar().getPreferredSize().getWidth(); + resultWidth += new JBScrollPane().getVerticalScrollBar().getPreferredSize().getWidth(); } return new Dimension(resultWidth, resultHeight); diff --git a/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.form b/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.form index 811d6ca765be..91784e6483ab 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.form +++ b/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.form @@ -8,7 +8,7 @@ - + diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.form b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.form index d9bc61b66b57..45eb728ffdb4 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.form +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.form @@ -13,7 +13,7 @@ - + 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 785e87ebf96f..84b2a3ea7d93 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java @@ -27,6 +27,7 @@ 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; @@ -40,7 +41,7 @@ import java.beans.PropertyChangeListener; * @author yole */ public abstract class TestResultsPanel extends JPanel implements Disposable { - private JScrollPane myLeftPane; + private JBScrollPane myLeftPane; private JComponent myStatisticsComponent; private Splitter mySplitter; protected final JComponent myConsole; @@ -92,15 +93,15 @@ public abstract class TestResultsPanel extends JPanel implements Disposable { mySplitter = new Splitter(); new AwtVisitor(myConsole) { public boolean visit(Component component) { - if (component instanceof JScrollPane) { - ((JScrollPane) component).putClientProperty(UIUtil.KEEP_BORDER_SIDES, SideBorder.TOP | SideBorder.LEFT); + if (component instanceof JBScrollPane) { + ((JBScrollPane) component).putClientProperty(UIUtil.KEEP_BORDER_SIDES, SideBorder.TOP | SideBorder.LEFT); return true; } return false; } }; mySplitter.setFirstComponent(createOutputTab(myConsole, myConsoleActions)); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myStatisticsComponent); + final JBScrollPane 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 d4454a430c76..e73b495eec1c 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 @@ -24,6 +24,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.ui.SeparatorFactory; import com.intellij.ui.TextComponentUndoProvider; +import com.intellij.ui.components.JBScrollPane; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -35,7 +36,7 @@ public class CommitMessage extends JPanel implements Disposable { public CommitMessage() { super(new BorderLayout()); - final JScrollPane scrollPane = new JScrollPane(myCommentArea); + final JBScrollPane scrollPane = new JBScrollPane(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 bedd65ad47b5..9623296b6d28 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 @@ -30,6 +30,7 @@ import com.intellij.openapi.vcs.impl.VcsBackgroundableActions; import com.intellij.openapi.vfs.VirtualFile; 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; @@ -192,7 +193,7 @@ public class CompareWithSelectedRevisionAction extends AbstractVcsAction { } } }); - final JScrollPane textScrollPane = new JScrollPane(textArea); + final JBScrollPane textScrollPane = new JBScrollPane(textArea); panel.add(textScrollPane, BorderLayout.CENTER); textScrollPane.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.lightGray),VcsBundle.message("border.selected.revision.commit.message"))); return panel; @@ -284,7 +285,7 @@ public class CompareWithSelectedRevisionAction extends AbstractVcsAction { }); JPanel jPanel = new JPanel(new BorderLayout()); - final JScrollPane textScrollPane = new JScrollPane(textArea); + final JBScrollPane textScrollPane = new JBScrollPane(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 9efdbbf85551..57cb372e42ab 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,6 +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.content.Content; import com.intellij.ui.content.ContentFactory; import com.intellij.util.Alarm; @@ -182,7 +183,7 @@ public class ChangesViewManager extends AbstractProjectComponent implements JDOM panel.setToolbar(toolbarPanel); final JPanel content = new JPanel(new BorderLayout()); - content.add(new JScrollPane(myView), BorderLayout.CENTER); + content.add(new JBScrollPane(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 1cd4f44c3722..f16816930b09 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,6 +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.util.EditSourceOnDoubleClickHandler; import com.intellij.util.EditSourceOnEnterKeyHandler; import com.intellij.util.Icons; @@ -131,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 JScrollPane(myView), BorderLayout.CENTER); + myPanel.add(new JBScrollPane(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 396199bdaed1..a5af63b1f52d 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 @@ -21,14 +21,15 @@ import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; 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.util.ui.UIUtil; import com.intellij.xml.util.XmlStringUtil; import org.jetbrains.annotations.NonNls; @@ -107,7 +108,7 @@ public class ChangeListDetailsAction extends AnAction implements DumbAware { } } }); - JScrollPane scrollPane = new JScrollPane(editorPane); + JBScrollPane scrollPane = new JBScrollPane(editorPane); final JBPopup hint = JBPopupFactory.getInstance().createComponentPopupBuilder(scrollPane, editorPane) .setDimensionServiceKey(project, "changelist.details.popup", false) @@ -119,4 +120,4 @@ public class ChangeListDetailsAction extends AnAction implements DumbAware { hint.showInBestPositionFor(DataManager.getInstance().getDataContext()); } -} \ No newline at end of file +} 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 fa99872d247e..95151103e638 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,6 +23,7 @@ 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; @@ -41,7 +42,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * @author yole */ public class ColumnFilteringStrategy implements ChangeListFilteringStrategy { - private final JScrollPane myScrollPane; + private final JBScrollPane 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 5eba88c35fe7..f3a1992b116c 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 @@ -33,6 +33,7 @@ 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.table.TableView; import com.intellij.util.ui.SortableColumnModel; import com.intellij.util.ui.UIUtil; @@ -86,7 +87,7 @@ public class CommittedChangesBrowser extends JPanel { myCommitMessageArea.setEditable(false); JPanel commitPanel = new JPanel(new BorderLayout()); - commitPanel.add(new JScrollPane(myCommitMessageArea), BorderLayout.CENTER); + commitPanel.add(new JBScrollPane(myCommitMessageArea), BorderLayout.CENTER); final JComponent separator = SeparatorFactory.createSeparator(VcsBundle.message("label.commit.comment"), myCommitMessageArea); commitPanel.add(separator, BorderLayout.NORTH); @@ -114,7 +115,7 @@ public class CommittedChangesBrowser extends JPanel { ++ innerGb.gridy; innerGb.weighty = 1; innerGb.fill = GridBagConstraints.BOTH; - listContainer.add(new JScrollPane(myChangeListsView), innerGb); + listContainer.add(new JBScrollPane(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 c3598341c4b1..7615f89fa625 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 @@ -30,6 +30,7 @@ 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.treeStructure.Tree; import com.intellij.ui.treeStructure.actions.CollapseAllAction; import com.intellij.ui.treeStructure.actions.ExpandAllAction; @@ -113,7 +114,7 @@ public class CommittedChangesTreeBrowser extends JPanel implements TypeSafeDataP final Splitter filterSplitter = new Splitter(false, 0.5f); - filterSplitter.setSecondComponent(new JScrollPane(myChangesTree)); + filterSplitter.setSecondComponent(new JBScrollPane(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 64bd17449bb6..eb7909e6b270 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,13 +25,13 @@ 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.treeStructure.Tree; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import javax.swing.border.Border; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.TreeSelectionEvent; @@ -39,7 +39,6 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import java.util.*; -import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; /** @@ -139,7 +138,7 @@ public class StructureFilteringStrategy implements ChangeListFilteringStrategy { } } }); - myScrollPane = new JScrollPane(myStructureTree); + myScrollPane = new JBScrollPane(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 b9b6bd8e11de..c46c4bb46f79 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,6 +18,7 @@ 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; @@ -86,7 +87,7 @@ public class WiseSplitter { } private void setBorder(JComponent c, boolean leftMost) { - if (c instanceof JScrollPane) c.setBorder(leftMost ? LEFT_BORDER : MIDDLE_BORDER); + if (c instanceof JBScrollPane) 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/conflicts/ChangelistConflictConfigurable.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.form index 24b82e958809..544e065628e1 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.form @@ -48,7 +48,7 @@ - + diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.form index ba278b2fefb7..951dab5e6f7d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.form @@ -59,7 +59,7 @@ - + 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 d972be6e2910..47ee76aa65da 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 @@ -48,6 +48,7 @@ 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.content.Content; import com.intellij.ui.content.ContentFactory; import com.intellij.ui.treeStructure.Tree; @@ -180,7 +181,7 @@ public class ShelvedChangesViewManager implements ProjectComponent { } else { if (myContent == null) { - JScrollPane scrollPane = new JScrollPane(myTree); + JBScrollPane scrollPane = new JBScrollPane(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 259de7485e40..28dfc213369f 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 @@ -37,6 +37,7 @@ import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeListImpl; import com.intellij.ui.BrowserHyperlinkListener; 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; @@ -60,7 +61,7 @@ public class ChangeListViewerDialog extends DialogWrapper implements DataProvide private final boolean myInAir; private Change[] myChanges; private NotNullFunction myConvertor; - private JScrollPane commitMessageScroll; + private JBScrollPane commitMessageScroll; public ChangeListViewerDialog(Project project, CommittedChangeList changeList) { super(project, true); @@ -100,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 JScrollPane(myCommitMessageArea); + commitMessageScroll = new JBScrollPane(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 dc0c545f97cb..1a622342a57d 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,6 +37,7 @@ 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; @@ -539,7 +540,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 JScrollPane) { + if (scrollPane instanceof JBScrollPane) { 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 058eaec4e8af..afae1f16f06c 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,6 +35,7 @@ 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; @@ -60,8 +61,8 @@ import java.util.List; public abstract class ChangesTreeList extends JPanel { private final Tree myTree; private final JBList myList; - private final JScrollPane myTreeScrollPane; - private final JScrollPane myListScrollPane; + private final JBScrollPane myTreeScrollPane; + private final JBScrollPane myListScrollPane; protected final Project myProject; private final boolean myShowCheckboxes; private final boolean myHighlightProblems; @@ -135,8 +136,8 @@ public abstract class ChangesTreeList extends JPanel { myList = new JBList(new DefaultListModel()); myList.setVisibleRowCount(10); - add(myListScrollPane = new JScrollPane(myList), LIST_CARD); - add(myTreeScrollPane = new JScrollPane(myTree), TREE_CARD); + add(myListScrollPane = new JBScrollPane(myList), LIST_CARD); + add(myTreeScrollPane = new JBScrollPane(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 67c54a808d26..d0a68c6ebf66 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 @@ -40,6 +40,7 @@ import com.intellij.openapi.vcs.ui.RefreshableOnComponent; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.IdeBorderFactory; 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,7 +978,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj myArea.setText(dialog.getCommitMessage()); myArea.setLineWrap(true); myArea.setWrapStyleWord(true); - JScrollPane scrollPane = new JScrollPane(myArea); + JBScrollPane scrollPane = new JBScrollPane(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/changes/ui/EditChangelistPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/EditChangelistPanel.form index 8fd403185a25..9f11a18252ab 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/EditChangelistPanel.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/EditChangelistPanel.form @@ -34,7 +34,7 @@ - + diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.form index 8d2db21fcf99..35b40c51d50d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.form @@ -47,7 +47,7 @@ - + diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.form index 19952ca98b60..d6f33769bc98 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.form @@ -8,7 +8,7 @@ - + diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsConfigurationsDialog.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsConfigurationsDialog.form index 972e20b8a4e8..5d66a9d65dd4 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsConfigurationsDialog.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsConfigurationsDialog.form @@ -27,7 +27,7 @@ - + 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 eda6ef43678f..afbf65eceb6d 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,6 +25,7 @@ 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.*; @@ -48,7 +49,7 @@ public class VcsConfigurationsDialog extends DialogWrapper{ append(name, new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, list.getForeground())); } }; - private JScrollPane myVcsesScrollPane; + private JBScrollPane 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 b58a0d637bd8..ec6296c09afc 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,6 +26,7 @@ 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; @@ -40,8 +41,8 @@ import javax.swing.table.TableCellRenderer; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.ItemListener; import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.io.File; import java.util.*; import java.util.List; @@ -261,7 +262,7 @@ public class VcsDirectoryConfigurationPanel extends PanelWithButtons implements } protected JComponent createMainComponent() { - return new JScrollPane(myDirectoryMappingTable); + return new JBScrollPane(myDirectoryMappingTable); } public void reset() { @@ -323,4 +324,4 @@ public class VcsDirectoryConfigurationPanel extends PanelWithButtons implements public void disposeUIResources() { } -} \ No newline at end of file +} 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 cc06dee9802b..aa85734a6566 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,6 +61,7 @@ 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; @@ -650,7 +651,7 @@ public class FileHistoryPanelImpl - + diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerUIUtil.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerUIUtil.java index 202fef7348a9..5fb91500842d 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerUIUtil.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerUIUtil.java @@ -27,6 +27,7 @@ import com.intellij.openapi.util.DimensionService; import com.intellij.openapi.wm.WindowManager; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.awt.RelativePoint; +import com.intellij.ui.components.JBScrollPane; import com.intellij.xdebugger.frame.XFullValueEvaluator; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -106,7 +107,7 @@ public class DebuggerUIUtil { textArea.setBackground(HintUtil.INFORMATION_COLOR); textArea.setLineWrap(false); - final JScrollPane component = ScrollPaneFactory.createScrollPane(textArea); + final JBScrollPane component = ScrollPaneFactory.createScrollPane(textArea); final Dimension frameSize = WindowManager.getInstance().getFrame(project).getSize(); Dimension size = DimensionService.getInstance().getSize(FULL_VALUE_POPUP_DIMENSION_KEY, project); if (size == null) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspection.form b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspection.form index 5067fe51ce97..cfb5e5e52c3e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspection.form +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspection.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaught.form b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaught.form index 471dffa744a1..0dd1b8850b80 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaught.form +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaught.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclared.form b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclared.form index 44601076a628..86f47ae9ff64 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclared.form +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclared.form @@ -38,7 +38,7 @@ - + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionThrown.form b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionThrown.form index 1935dbb75c0d..d94e6bd4152b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionThrown.form +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionThrown.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.Form.form b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.Form.form index de92db9c724f..5833ae2bdd5e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.Form.form +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.Form.form @@ -25,7 +25,7 @@ - + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/BooleanMethodNameMustStartWithQuestionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/BooleanMethodNameMustStartWithQuestionInspection.java index e3d223cee746..75e66df3761c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/BooleanMethodNameMustStartWithQuestionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/BooleanMethodNameMustStartWithQuestionInspection.java @@ -20,6 +20,7 @@ import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiType; +import com.intellij.ui.components.JBScrollPane; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -31,12 +32,8 @@ import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; +import javax.swing.*; +import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -93,7 +90,7 @@ public class BooleanMethodNameMustStartWithQuestionInspection new IGTable(new ListWrappingTableModel(questionList, InspectionGadgetsBundle.message( "boolean.method.name.must.start.with.question.table.column.name"))); - final JScrollPane scrollPane = new JScrollPane(table); + final JBScrollPane scrollPane = new JBScrollPane(table); final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; @@ -187,4 +184,4 @@ public class BooleanMethodNameMustStartWithQuestionInspection registerMethodError(method); } } -} \ No newline at end of file +} diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspection.java index 99f368ab9a90..c7a05a410b47 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspection.java @@ -19,6 +19,7 @@ import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiType; +import com.intellij.ui.components.JBScrollPane; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -30,12 +31,8 @@ import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; +import javax.swing.*; +import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -89,7 +86,7 @@ public class NonBooleanMethodNameMayNotStartWithQuestionInspection new IGTable(new ListWrappingTableModel(questionList, InspectionGadgetsBundle.message( "boolean.method.name.must.start.with.question.table.column.name"))); - final JScrollPane scrollPane = new JScrollPane(table); + final JBScrollPane scrollPane = new JBScrollPane(table); final GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; @@ -179,4 +176,4 @@ public class NonBooleanMethodNameMayNotStartWithQuestionInspection registerMethodError(method); } } -} \ No newline at end of file +} diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/QuestionableName.form b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/QuestionableName.form index 95b389f331e0..d0c078060dd6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/QuestionableName.form +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/QuestionableName.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java index 6abbea700f3d..81ff35b988e9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java @@ -19,6 +19,7 @@ import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.ui.components.JBScrollPane; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; @@ -30,12 +31,8 @@ import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; +import javax.swing.*; +import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -95,7 +92,7 @@ public class IOResourceInspection extends ResourceInspection { new IGTable(new ListWrappingTableModel(ignoredTypes, InspectionGadgetsBundle.message( "ignored.io.resource.types"))); - final JScrollPane scrollPane = new JScrollPane(table); + final JBScrollPane scrollPane = new JBScrollPane(table); panel.add(scrollPane, constraints); constraints.gridx = 1; constraints.weightx = 0.0; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/Serializable.form b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/Serializable.form index 48d6a6ea6aa8..bd122e2ba896 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/Serializable.form +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/Serializable.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplayImpl.form b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplayImpl.form index 131528e00db9..facb5413ef74 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplayImpl.form +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplayImpl.form @@ -1,6 +1,6 @@

- + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplayImpl.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplayImpl.java index 3c552368a7f9..aa913155b636 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplayImpl.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplayImpl.java @@ -15,15 +15,15 @@ */ package com.siyeh.ig.telemetry; -import javax.swing.JComponent; -import javax.swing.JScrollPane; -import javax.swing.JTable; +import com.intellij.ui.components.JBScrollPane; + +import javax.swing.*; import javax.swing.table.JTableHeader; public class TelemetryDisplayImpl implements TelemetryDisplay{ private JTable table; - private JScrollPane scrollPane; + private JBScrollPane scrollPane; private final TableSorter model; public TelemetryDisplayImpl(InspectionGadgetsTelemetry telemetry){ @@ -42,4 +42,4 @@ public class TelemetryDisplayImpl implements TelemetryDisplay{ table.setModel(model); table.repaint(); } -} \ No newline at end of file +} diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceForm.form b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceForm.form index e696a48cbb76..38494575ef52 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceForm.form +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceForm.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.form b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.form index b25fd18ce113..8d986adcd17b 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.form +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.form @@ -39,7 +39,7 @@ - + diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java index 532a85ccca1d..7c1808bfb6f6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java @@ -18,6 +18,7 @@ package com.intellij.lang.ant.config.execution; import com.intellij.openapi.util.IconLoader; import com.intellij.rt.ant.execution.AntMain2; import com.intellij.ui.MultilineTreeCellRenderer; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Icons; import javax.swing.*; @@ -32,7 +33,7 @@ final class MessageTreeRenderer extends MultilineTreeCellRenderer { private MessageTreeRenderer() { } - public static JScrollPane install(JTree tree) { + public static JBScrollPane install(JTree tree) { return MultilineTreeCellRenderer.installRenderer(tree, new MessageTreeRenderer()); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java index e2c73453d150..fff958b9069a 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java @@ -37,6 +37,7 @@ 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.treeStructure.Tree; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.OpenSourceUtil; @@ -150,7 +151,7 @@ public final class TreeView implements AntOutputView, OccurenceNavigator { JPanel panel = new JPanel(new BorderLayout()); - JScrollPane scrollPane = MessageTreeRenderer.install(myTree); + JBScrollPane scrollPane = MessageTreeRenderer.install(myTree); panel.add(scrollPane, BorderLayout.CENTER); return panel; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java index df40d66fc619..440e8373cf51 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java @@ -48,7 +48,11 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.ui.*; +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.treeStructure.Tree; import com.intellij.util.ArrayUtil; import com.intellij.util.StringBuilderSpinAllocator; @@ -138,7 +142,7 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider { myTree.setLineStyleAngled(); myAntBuildFilePropertiesAction = new AntBuildFilePropertiesAction(this); setToolbar(createToolbarPanel()); - setContent(new JScrollPane(myTree)); + setContent(new JBScrollPane(myTree)); ToolTipManager.sharedInstance().registerComponent(myTree); myKeymapListener = new KeymapListener(); diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java index 249e079f4b12..3e2cce317eca 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java @@ -23,6 +23,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.ui.ListUtil; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import javax.swing.*; @@ -96,7 +97,7 @@ public class SaveMetaTargetDialog extends DialogWrapper { 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(6, 0, 0, 0), 0, 0)); - panel.add(new JScrollPane(myTargetList), new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 2, 1.0, 1.0, + panel.add(new JBScrollPane(myTargetList), new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 2, 1.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(4, 0, 0, 0), 0, 0)); diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AnActionListEditor.form b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AnActionListEditor.form index cf6f24104e65..90f8a146c7e4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AnActionListEditor.form +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AnActionListEditor.form @@ -19,7 +19,7 @@ - + diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntClasspathEditorPanel.form b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntClasspathEditorPanel.form index a3b3a9b9e298..d68af3e02d70 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntClasspathEditorPanel.form +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntClasspathEditorPanel.form @@ -51,7 +51,7 @@ - + diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/FiltersTab.form b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/FiltersTab.form index 8dea826fbf78..c5ae652043fb 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/FiltersTab.form +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/FiltersTab.form @@ -18,7 +18,7 @@ - + diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/PropertiesTab.form b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/PropertiesTab.form index 90b2d8902cb6..77e09e903231 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/PropertiesTab.form +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/PropertiesTab.form @@ -9,7 +9,7 @@ - + diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightEditorForm.form b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightEditorForm.form index 5b9e57e3c491..b041fbec563e 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightEditorForm.form +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightEditorForm.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java index 68cc209a188f..a485f54a80b1 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java @@ -30,6 +30,7 @@ import com.intellij.psi.search.scope.packageSet.NamedScope; import com.intellij.ui.HyperlinkLabel; import com.intellij.ui.PanelWithButtons; import com.intellij.ui.TableUtil; +import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.table.TableView; import com.intellij.util.ui.*; import com.maddyhome.idea.copyright.CopyrightManager; @@ -217,7 +218,7 @@ public class ProjectSettingsPanel extends PanelWithButtons { protected JComponent createMainComponent() { - return new JScrollPane(myScopeMappingTable); + return new JBScrollPane(myScopeMappingTable); } public JComponent getMainComponent() { diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.form b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.form index 8de5eac8d073..ab1deeb0ab90 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.form +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.form @@ -24,7 +24,7 @@ - + diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfgurationPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfgurationPanel.java index 189a264c20e8..f454e2663705 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfgurationPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfgurationPanel.java @@ -20,6 +20,7 @@ import com.intellij.cvsSupport2.config.CvsRootConfiguration; import com.intellij.openapi.project.Project; 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; @@ -76,7 +77,7 @@ public class SelectCvsConfgurationPanel extends JPanel { private JPanel createListPanel() { JPanel result = new JPanel(new BorderLayout()); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); + JBScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); result.add(scrollPane, BorderLayout.CENTER); scrollPane.setFocusable(false); return result; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTree.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTree.java index acdde1dd06ed..664043d5ba8a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTree.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTree.java @@ -19,6 +19,7 @@ import com.intellij.cvsSupport2.config.CvsRootConfiguration; import com.intellij.cvsSupport2.ui.CvsTabbedWindow; import com.intellij.openapi.project.Project; import com.intellij.ui.TreeUIHelper; +import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.NonNls; @@ -128,7 +129,7 @@ public class CvsTree extends JPanel implements CvsTabbedWindow.DeactivateListene model.setTree(myTree); model.setCvsTree(this); - add(new JScrollPane(myTree), BorderLayout.CENTER); + add(new JBScrollPane(myTree), BorderLayout.CENTER); myTree.setModel(model); diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportSettingsStep.form b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportSettingsStep.form index bbc39a60d94e..c2f46b9067aa 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportSettingsStep.form +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportSettingsStep.form @@ -111,7 +111,7 @@ - + diff --git a/plugins/devkit/src/actions/NewActionForm.form b/plugins/devkit/src/actions/NewActionForm.form index 1962e4808240..2159bf9d6682 100644 --- a/plugins/devkit/src/actions/NewActionForm.form +++ b/plugins/devkit/src/actions/NewActionForm.form @@ -16,7 +16,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/plugins/devkit/src/util/ChooseModulesDialog.java b/plugins/devkit/src/util/ChooseModulesDialog.java index 93f36347c759..f6aaf35738e4 100644 --- a/plugins/devkit/src/util/ChooseModulesDialog.java +++ b/plugins/devkit/src/util/ChooseModulesDialog.java @@ -26,6 +26,7 @@ import com.intellij.psi.xml.XmlFile; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.table.JBTable; import org.jetbrains.annotations.NonNls; import org.jetbrains.idea.devkit.DevKitBundle; @@ -137,7 +138,7 @@ public class ChooseModulesDialog extends DialogWrapper { } panel.add(messagePanel, BorderLayout.CENTER); - final JScrollPane jScrollPane = new JScrollPane(); + final JBScrollPane jScrollPane = new JBScrollPane(); jScrollPane.setViewportView(myView); jScrollPane.setPreferredSize(new Dimension(300, 80)); panel.add(jScrollPane, BorderLayout.SOUTH); diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.form b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.form index 95596363ff78..19960b95817a 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.form +++ b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/history/browser/GitLogTree.java b/plugins/git4idea/src/git4idea/history/browser/GitLogTree.java index ef27ac23bc07..a51180e13a5f 100644 --- a/plugins/git4idea/src/git4idea/history/browser/GitLogTree.java +++ b/plugins/git4idea/src/git4idea/history/browser/GitLogTree.java @@ -46,6 +46,7 @@ import com.intellij.ui.ListSpeedSearch; import com.intellij.ui.PopupHandler; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.*; import com.intellij.util.containers.Convertor; @@ -270,7 +271,7 @@ public class GitLogTree implements GitTreeViewI { myCommitsList.setCellRenderer(myListCellRenderer); myMainSplitter.setFirstComponent(myFiltersSplitter); - final JScrollPane sp = new JScrollPane(myCommitsList, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + final JBScrollPane sp = new JBScrollPane(myCommitsList, JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JBScrollPane.HORIZONTAL_SCROLLBAR_NEVER); myRepositoryChangesBrowser = new RepositoryChangesBrowser(myProject, Collections.emptyList(), Collections.emptyList(), null); myRepositoryChangesBrowser.getDiffAction().registerCustomShortcutSet(CommonShortcuts.getDiff(), myCommitsList); @@ -1098,7 +1099,7 @@ public class GitLogTree implements GitTreeViewI { titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD)); myPanel.add(titleLabel, BorderLayout.NORTH); - myPanel.add(new JScrollPane(myTree), BorderLayout.CENTER); + myPanel.add(new JBScrollPane(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 705bf467987e..a190bcb05617 100644 --- a/plugins/git4idea/src/git4idea/history/browser/GitLogTreeFileSelector.java +++ b/plugins/git4idea/src/git4idea/history/browser/GitLogTreeFileSelector.java @@ -21,6 +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 javax.swing.*; import java.awt.*; @@ -60,7 +61,7 @@ public class GitLogTreeFileSelector extends DialogWrapper { tree.setCellRenderer(new GitLogTreeFileSelectorRenderer(myProject)); myFileSystemTree.select(myRoot, null); - myPanel.add(new JScrollPane(tree), BorderLayout.CENTER); + myPanel.add(new JBScrollPane(tree), BorderLayout.CENTER); } @Override diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.form b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.form index 83ead772201d..05b0d69f8618 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.form +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.form @@ -53,7 +53,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.form b/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.form index 1c0e8ff608c8..e397ba534cd1 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.form +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.form @@ -17,7 +17,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.form b/plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.form index 96bece12aba8..e2ef942d1e4d 100644 --- a/plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.form +++ b/plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.form @@ -17,7 +17,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.form b/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.form index 45e2556707a6..d198315c4e9e 100644 --- a/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.form +++ b/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.form @@ -51,7 +51,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.form b/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.form index 5ec41a758035..5d4cd1fe472d 100644 --- a/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.form +++ b/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.form @@ -10,7 +10,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/ui/GitTagDialog.form b/plugins/git4idea/src/git4idea/ui/GitTagDialog.form index b210963bd775..85242ecd3011 100644 --- a/plugins/git4idea/src/git4idea/ui/GitTagDialog.form +++ b/plugins/git4idea/src/git4idea/ui/GitTagDialog.form @@ -71,7 +71,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.form b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.form index b445201fb1e5..c2ccb721d6f7 100644 --- a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.form +++ b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.form @@ -112,7 +112,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.form b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.form index 957d5b847626..a97507f24ec9 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.form +++ b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.form @@ -32,7 +32,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/vfs/GitFixRootsDialog.form b/plugins/git4idea/src/git4idea/vfs/GitFixRootsDialog.form index 1ad48be4fbdc..9b165ce13a5c 100644 --- a/plugins/git4idea/src/git4idea/vfs/GitFixRootsDialog.form +++ b/plugins/git4idea/src/git4idea/vfs/GitFixRootsDialog.form @@ -17,7 +17,7 @@ - + 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 510532a89202..a2454a5b69e8 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,6 +34,7 @@ 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; @@ -157,7 +158,7 @@ public class DynamicToolWindowWrapper { myTreeTablePanel.removeAll(); - final JScrollPane treeTable = createTable(root); + final JBScrollPane treeTable = createTable(root); if (expandAll) { TreeUtil.expandAll(myTreeTable.getTree()); @@ -204,7 +205,7 @@ public class DynamicToolWindowWrapper { return rootNode; } - private JScrollPane createTable(final MutableTreeNode myTreeRoot) { + private JBScrollPane createTable(final MutableTreeNode myTreeRoot) { ColumnInfo[] columnInfos = {new ClassColumnInfo(myColumnNames[CLASS_OR_ELEMENT_NAME_COLUMN]), new PropertyTypeColumnInfo(myColumnNames[TYPE_COLUMN])}; @@ -372,7 +373,7 @@ public class DynamicToolWindowWrapper { myTreeTable.getColumn(myColumnNames[CLASS_OR_ELEMENT_NAME_COLUMN]).setPreferredWidth(200); myTreeTable.getColumn(myColumnNames[TYPE_COLUMN]).setPreferredWidth(160); - JScrollPane scrollpane = ScrollPaneFactory.createScrollPane(myTreeTable); + JBScrollPane scrollpane = ScrollPaneFactory.createScrollPane(myTreeTable); scrollpane.setPreferredSize(new Dimension(600, 400)); return scrollpane; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/ui/ManagedLibrariesEditor.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/ui/ManagedLibrariesEditor.form index fa094379dbdb..2d6461c75b81 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/ui/ManagedLibrariesEditor.form +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/ui/ManagedLibrariesEditor.form @@ -48,7 +48,7 @@ - + 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 656d33b94215..86bf0ad21f89 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java @@ -25,6 +25,7 @@ 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; @@ -68,7 +69,7 @@ public final class GroovyDocGenerationPanel extends JPanel { myPackagesList = new JBList(myDataModel); myPackagesList.setMinimumSize(new Dimension(100, 150)); - JScrollPane packagesScrollPane = ScrollPaneFactory.createScrollPane(myPackagesList); + JBScrollPane 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 a537c350ab9a..f23b711a9cfd 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,19 +15,10 @@ */ package org.jetbrains.plugins.groovy.gradle.ui; -import javax.swing.AbstractAction; -import javax.swing.BorderFactory; -import javax.swing.Box; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; +import com.intellij.ui.components.JBScrollPane; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; /** @@ -110,7 +101,7 @@ public class GradleSetupPanel detailsTextArea.setText( message + "\n" + messageDetails ); detailsTextArea.setCaretPosition( 0 ); //put the caret at the front. - JScrollPane scrollPane = new JScrollPane( detailsTextArea ); + JBScrollPane scrollPane = new JBScrollPane( detailsTextArea ); scrollPane.setPreferredSize( new Dimension( 400, 500 ) ); JOptionPane.showMessageDialog( mainPanel, scrollPane ); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureDialog.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureDialog.form index fafc8c3bbab0..a6e8e6b5a11d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureDialog.form +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureDialog.form @@ -43,7 +43,7 @@ - + @@ -186,7 +186,7 @@ - + diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/TableWithButtons.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/TableWithButtons.form index f19c2b2bcfc7..8fb74c3236e3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/TableWithButtons.form +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/TableWithButtons.form @@ -55,7 +55,7 @@ - + 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 f3d3739c486e..367fc4ef1c4b 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,6 +25,7 @@ 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; @@ -216,7 +217,7 @@ public class ParameterTablePanel extends JPanel { }); JPanel listPanel = new JPanel(new BorderLayout()); - JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); + JBScrollPane 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.form b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.form index 3eae5671f2d7..e60b9d0e6447 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.form +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java index b3630f2a58da..a022cf0fb2e4 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java @@ -14,19 +14,14 @@ 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.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; - -import javax.swing.Action; -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import java.awt.Insets; -import java.awt.Dimension; - import org.apache.commons.lang.StringUtils; +import javax.swing.*; +import java.awt.*; + public class HgGlobalStatusDialog extends DialogWrapper { private JPanel contentPanel; private JTextArea outputTextArea; @@ -68,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 JScrollPane scrollPane1 = new JScrollPane(); + final JBScrollPane scrollPane1 = new JBScrollPane(); 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 dd69617045b4..cf7be8c2cc70 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 @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.ui.DocumentAdapter; 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; @@ -72,7 +73,7 @@ public class MavenArtifactSearchPanel extends JPanel { setLayout(new BorderLayout()); add(mySearchField, BorderLayout.NORTH); - add(new JScrollPane(myResultList), BorderLayout.CENTER); + add(new JBScrollPane(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/indices/MavenIndicesConfigurable.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesConfigurable.form index 08f938f61ff3..ce41ac9d4cdc 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesConfigurable.form +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesConfigurable.form @@ -8,7 +8,7 @@ - + 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 95252e187fab..ffb7d3535c58 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,6 +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.treeStructure.SimpleTree; import gnu.trove.THashMap; import gnu.trove.THashSet; @@ -35,7 +36,6 @@ import org.jetbrains.idea.maven.model.MavenConstants; import org.jetbrains.idea.maven.project.MavenProject; import org.jetbrains.idea.maven.utils.MavenDataKeys; -import javax.swing.*; import java.awt.*; import java.util.*; import java.util.List; @@ -65,7 +65,7 @@ public class MavenProjectsNavigatorPanel extends SimpleToolWindowPanel implement actionToolbar.setTargetComponent(tree); setToolbar(actionToolbar.getComponent()); - setContent(new JScrollPane(myTree)); + setContent(new JBScrollPane(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 6af883ec78db..1532a37b7bdb 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,6 +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.treeStructure.SimpleNode; import com.intellij.ui.treeStructure.SimpleNodeVisitor; import com.intellij.ui.treeStructure.SimpleTree; @@ -90,7 +91,7 @@ public class SelectFromMavenProjectsDialog extends DialogWrapper { @Nullable protected JComponent createCenterPanel() { - final JScrollPane pane = new JScrollPane(myTree); + final JBScrollPane pane = new JBScrollPane(myTree); pane.setPreferredSize(new Dimension(320, 400)); return pane; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.form index f94ab0ce8538..fb8fb38c59b5 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.form +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.form @@ -16,7 +16,7 @@ - + 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 deebe3cd1cfc..896c9ede2285 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,6 +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.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; @@ -43,7 +44,7 @@ public class ChooserDialog extends DialogWrapper { @Nullable protected JComponent createCenterPanel() { - return new JScrollPane(myChooser); + return new JBScrollPane(myChooser); } protected JComponent createNorthPanel() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.form index 150d21f3a795..9c35f9e3c165 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.form +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.form @@ -148,7 +148,7 @@ - + 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 a50aae8a5e54..ae45ff8395f2 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 @@ -25,6 +25,7 @@ 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.treeStructure.Tree; import com.intellij.util.containers.Convertor; import com.intellij.util.ui.AbstractLayoutManager; @@ -85,10 +86,10 @@ public class MavenModuleWizardStep extends ModuleWizardStep { private JCheckBox myUseArchetypeCheckBox; private JButton myAddArchetypeButton; - private JScrollPane myArchetypesScrollPane; + private JBScrollPane myArchetypesScrollPane; private JPanel myArchetypesPanel; private Tree myArchetypesTree; - private JScrollPane myArchetypeDescriptionScrollPane; + private JBScrollPane myArchetypeDescriptionScrollPane; private JTextArea myArchetypeDescriptionField; private AtomicBoolean myLoadingCancelled = new AtomicBoolean(); @@ -105,7 +106,7 @@ public class MavenModuleWizardStep extends ModuleWizardStep { private void initComponents() { myArchetypesTree = new Tree(); myArchetypesTree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode())); - myArchetypesScrollPane = new JScrollPane(myArchetypesTree); + myArchetypesScrollPane = new JBScrollPane(myArchetypesTree); myLoadingIcon.setVisible(false); diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java index 9eedc7434961..8fda540a1968 100644 --- a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java +++ b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java @@ -60,6 +60,7 @@ import com.intellij.openapi.vfs.*; import com.intellij.psi.*; import com.intellij.ui.GuiUtils; import com.intellij.ui.IdeBorderFactory; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Alarm; import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.UIUtil; @@ -153,7 +154,7 @@ public class ResourceBundleEditor extends UserDataHolderBase implements FileEdit if (!myProject.isOpen()) return; JPanel valuesPanelComponent = new MyJPanel(new GridBagLayout()); - myValuesPanel.add(new JScrollPane(valuesPanelComponent){ + myValuesPanel.add(new JBScrollPane(valuesPanelComponent){ @Override public void updateUI() { super.updateUI(); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/ConfigureProxiesOptionsPanel.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/ConfigureProxiesOptionsPanel.form index 7c44a1b4a31e..02466c010762 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/ConfigureProxiesOptionsPanel.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/ConfigureProxiesOptionsPanel.form @@ -122,7 +122,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -268,7 +268,7 @@ - + diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/BranchConfigurationDialog.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/BranchConfigurationDialog.form index 3c8a84034dcb..1b217bf0e764 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/BranchConfigurationDialog.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/BranchConfigurationDialog.form @@ -24,7 +24,7 @@ - + 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 e4fdcd238a84..88e5db0d977e 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java @@ -27,6 +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.components.labels.LinkLabel; import com.intellij.ui.components.labels.LinkListener; import com.intellij.util.containers.Convertor; @@ -118,7 +119,7 @@ public class CopiesPanel { } } }); - myHolder = new JScrollPane(holderPanel); + myHolder = new JBScrollPane(holderPanel); setFocusableForLinks(myRefreshLabel); refreshView.run(); initView(); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.form index a941fdb74429..1e9e5a9849f6 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.form @@ -17,7 +17,7 @@ - + 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 13fb65df1fd1..a3eb4277717b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java @@ -17,6 +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.util.ui.OptionsDialog; import org.jetbrains.annotations.NonNls; import org.jetbrains.idea.svn.SvnBundle; @@ -87,8 +88,8 @@ public class LockDialog extends OptionsDialog { gc.fill = GridBagConstraints.BOTH; myLockTextArea = new JTextArea(7, 25); - JScrollPane scrollPane = new JScrollPane(myLockTextArea, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + JBScrollPane scrollPane = new JBScrollPane(myLockTextArea, JBScrollPane.VERTICAL_SCROLLBAR_ALWAYS, + JBScrollPane.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 61075af3bc05..39795c247533 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java @@ -17,6 +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 javax.swing.*; import java.awt.*; @@ -42,7 +43,7 @@ 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 JScrollPane scroll = new JScrollPane(myComponentManager.getComponent(), JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + final JBScrollPane scroll = new JBScrollPane(myComponentManager.getComponent(), JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JBScrollPane.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 353836721e25..9ed8cd1b555d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java @@ -24,6 +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.table.JBTable; import com.intellij.util.containers.HashMap; import org.jetbrains.idea.svn.SvnVcs; @@ -76,8 +77,8 @@ public class PropertiesComponent extends JPanel { myTable = new JBTable(); myTextArea = new JTextArea(0, 0); myTextArea.setEditable(false); - JScrollPane scrollPane = new JScrollPane(myTable); - mySplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true, scrollPane, new JScrollPane(myTextArea)); + JBScrollPane scrollPane = new JBScrollPane(myTable); + mySplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true, scrollPane, new JBScrollPane(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 1c30e88548ff..f2fd117b61dd 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java @@ -25,6 +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.treeStructure.Tree; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.NotNullFunction; @@ -192,8 +193,8 @@ public class RepositoryBrowserComponent extends JPanel implements Disposable, Da myRepositoryTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); myRepositoryTree.setRootVisible(false); myRepositoryTree.setShowsRootHandles(true); - JScrollPane scrollPane = new JScrollPane(myRepositoryTree, - JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); + JBScrollPane scrollPane = new JBScrollPane(myRepositoryTree, + JBScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JBScrollPane.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 ccf0b71adb49..803136fab41b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java @@ -20,6 +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.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.idea.svn.SvnBundle; @@ -115,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 JScrollPane(myFilesList), BorderLayout.CENTER); + panel.add(new JBScrollPane(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 624f75ed5823..b3c1c2c898d1 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java @@ -17,6 +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 org.jetbrains.annotations.NonNls; import org.jetbrains.idea.svn.SvnBundle; import org.tmatesoft.svn.core.auth.ISVNAuthenticationProvider; @@ -93,7 +94,7 @@ public class ServerSSLDialog extends DialogWrapper { JTextArea area = new JTextArea(5, 50); area.setText(getServerCertificateInfo(myCertificate)); area.setEditable(false); - panel.add(new JScrollPane(area), BorderLayout.CENTER); + panel.add(new JBScrollPane(area), BorderLayout.CENTER); return panel; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.form index 68a95d9d269e..d3aa4112db1d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.form @@ -37,7 +37,7 @@ - + diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnMapDialog.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnMapDialog.form index 89e63fc1512c..cae69b6897cb 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnMapDialog.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnMapDialog.form @@ -29,7 +29,7 @@ - + diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/CheckoutOptionsDialog.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/CheckoutOptionsDialog.form index f6245da64f02..fca62dce2101 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/CheckoutOptionsDialog.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/CheckoutOptionsDialog.form @@ -81,7 +81,7 @@ - + diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/CopyOptionsDialog.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/CopyOptionsDialog.form index 0184dc065ab5..843f19ebd63c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/CopyOptionsDialog.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/CopyOptionsDialog.form @@ -84,7 +84,7 @@ - + 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 6d569fce7b67..c5cb5f816849 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,6 +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.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -78,7 +79,7 @@ public class DeleteOptionsDialog extends DialogWrapper { myCommitMessage = new JTextArea(10, 0); myCommitMessage.setWrapStyleWord(true); myCommitMessage.setLineWrap(true); - panel.add(new JScrollPane(myCommitMessage), gc); + panel.add(new JBScrollPane(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 6de82420a5d8..5c159960c6a0 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,6 +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.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -151,7 +152,7 @@ public class ImportOptionsDialog extends DialogWrapper implements ActionListener myCommitMessage = new JTextArea(10, 0); myCommitMessage.setWrapStyleWord(true); myCommitMessage.setLineWrap(true); - panel.add(new JScrollPane(myCommitMessage), gc); + panel.add(new JBScrollPane(myCommitMessage), gc); gc.gridy += 1; gc.gridwidth = 3; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialog.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialog.form index 83b8dcd02811..7717abaf507b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialog.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialog.form @@ -53,7 +53,7 @@ - + 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 e42ba38c329b..67cec729fb47 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java @@ -32,6 +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.util.Consumer; import com.intellij.util.NullableFunction; import com.intellij.util.messages.Topic; @@ -390,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 JScrollPane(myPanelWrapper, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + return new JBScrollPane(myPanelWrapper, JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, + JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); } // todo refactor to get rid of duplicate code dealing with separators diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegratedSelectedOptionsDialog.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegratedSelectedOptionsDialog.form index ea633479c143..ca50a0254e0f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegratedSelectedOptionsDialog.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegratedSelectedOptionsDialog.form @@ -16,7 +16,7 @@ - + diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MultipleRootsEditor.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MultipleRootsEditor.form index 39d9a4446a46..3f419b680b6b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MultipleRootsEditor.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MultipleRootsEditor.form @@ -19,7 +19,7 @@ - + diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form index 5c98e69aee8d..38298f9f7283 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form @@ -248,7 +248,7 @@ - + @@ -322,7 +322,7 @@ - + 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 c8f5a2177b61..c20492b167f8 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundAction.java @@ -19,6 +19,7 @@ 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; @@ -185,7 +186,7 @@ public class SurroundAction extends AbstractGuiEditorAction { } private boolean canWrapSelection(final ArrayList selection) { - if (myComponentClass.equals(JScrollPane.class.getName())) { + if (myComponentClass.equals(JBScrollPane.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 4483f06bc9ec..27e705ea3e7f 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundActionGroup.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundActionGroup.java @@ -19,6 +19,7 @@ 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.*; @@ -32,7 +33,7 @@ public class SurroundActionGroup extends ActionGroup { public SurroundActionGroup() { myChildren = new AnAction[4]; myChildren [0] = new SurroundAction(JPanel.class.getName()); - myChildren [1] = new SurroundAction(JScrollPane.class.getName()); + myChildren [1] = new SurroundAction(JBScrollPane.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/clientProperties/ConfigureClientPropertiesDialog.form b/plugins/ui-designer/src/com/intellij/uiDesigner/clientProperties/ConfigureClientPropertiesDialog.form index 75f68e078abc..9bedcbeba68a 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/clientProperties/ConfigureClientPropertiesDialog.form +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/clientProperties/ConfigureClientPropertiesDialog.form @@ -25,7 +25,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java index 8bf4b8ea8482..08f350d30cfc 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java @@ -22,6 +22,7 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Pair; import com.intellij.ui.LightColors; +import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.CaptionSelection; import com.intellij.uiDesigner.FormEditingUtil; import com.intellij.uiDesigner.GridChangeUtil; @@ -264,7 +265,7 @@ public class GridCaptionPanel extends JPanel implements ComponentSelectionListen return myEditor.getData(dataId); } - public void attachToScrollPane(final JScrollPane scrollPane) { + public void attachToScrollPane(final JBScrollPane scrollPane) { scrollPane.getViewport().addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { repaint(); 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 a3f4150a240d..321117fa07b4 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java @@ -37,6 +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.uiDesigner.*; import com.intellij.uiDesigner.compiler.Utils; import com.intellij.uiDesigner.componentTree.ComponentPtr; @@ -300,7 +301,7 @@ public final class GuiEditor extends JPanel implements DataProvider { gbc.gridy = 1; gbc.weightx = 1.0; gbc.weighty = 1.0; - final JScrollPane scrollPane = new JScrollPane(myLayeredPane); + final JBScrollPane scrollPane = new JBScrollPane(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 ff98c0511d9f..fabe095a338d 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java @@ -35,6 +35,7 @@ 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; @@ -73,7 +74,7 @@ public final class InsertComponentProcessor extends EventProcessor { private static final Map myComponentClassMap = new HashMap(); static { - myComponentClassMap.put(JScrollPane.class.getName(), new RadScrollPane.Factory()); + myComponentClassMap.put(JBScrollPane.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 8c5b4e79b663..d72bf108f9d7 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoScrollPaneInspection.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoScrollPaneInspection.java @@ -17,6 +17,7 @@ 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; @@ -45,7 +46,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(), JScrollPane.class)) { + !FormInspectionUtil.isComponentClass(module, component.getParentContainer(), JBScrollPane.class)) { collector.addError(getID(), component, null, UIDesignerBundle.message("inspection.no.scroll.pane"), new EditorQuickFixProvider() { public QuickFix createQuickFix(GuiEditor editor, RadComponent component) { @@ -63,7 +64,7 @@ public class NoScrollPaneInspection extends BaseFormInspection { public void run() { ArrayList targetList = new ArrayList(Collections.singletonList(myComponent)); - new SurroundAction(JScrollPane.class.getName()).actionPerformed(myEditor, targetList, null); + new SurroundAction(JBScrollPane.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 808ff53f3f99..0db124b744fb 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspector.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspector.java @@ -19,20 +19,24 @@ 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.uiDesigner.radComponents.*; +import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.componentTree.ComponentSelectionListener; import com.intellij.uiDesigner.componentTree.ComponentTree; -import com.intellij.uiDesigner.designSurface.GuiEditor; import com.intellij.uiDesigner.designSurface.GridCaptionPanel; -import com.intellij.uiDesigner.quickFixes.QuickFixManager;import com.intellij.util.IJSwingUtilities; -import org.jetbrains.annotations.NotNull; +import com.intellij.uiDesigner.designSurface.GuiEditor; +import com.intellij.uiDesigner.quickFixes.QuickFixManager; +import com.intellij.uiDesigner.radComponents.*; +import com.intellij.util.IJSwingUtilities; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; -import javax.swing.*;import javax.swing.event.ChangeListener;import javax.swing.event.ChangeEvent; +import javax.swing.*; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.*; import java.util.List; /** @@ -48,7 +52,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 JScrollPane myCustomPropertiesScrollPane = new JScrollPane(); + private final JBScrollPane myCustomPropertiesScrollPane = new JBScrollPane(); private CustomPropertiesPanel myCustomPropertiesPanel; private final ChangeListener myCustomPropertiesChangeListener; private RadContainer myPropertiesPanelContainer; @@ -61,7 +65,7 @@ public final class PropertyInspector extends JPanel{ // Card with property inspector final JPanel inspectorCard = new JPanel(new GridBagLayout()); - final JScrollPane inspectorScrollPane = ScrollPaneFactory.createScrollPane(myInspectorTable); + final JBScrollPane 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 48fd29c0ea86..3755c9c55d28 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java @@ -31,6 +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.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.componentTree.ComponentTree; import com.intellij.uiDesigner.componentTree.ComponentTreeBuilder; @@ -42,12 +43,11 @@ 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; import java.awt.*; -import java.util.*; +import java.util.ArrayList; import java.util.List; /** @@ -93,7 +93,7 @@ public class UIDesignerToolWindowManager implements ProjectComponent { myComponentTree.addTreeSelectionListener(listener); } myPendingListeners.clear(); - final JScrollPane scrollPane = new JScrollPane(myComponentTree); + final JBScrollPane scrollPane = new JBScrollPane(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 b56d84577ffb..37cf01c6cf40 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 @@ -19,28 +19,28 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TextFieldWithBrowseButton; 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.PropertyEditor; import com.intellij.uiDesigner.propertyInspector.InplaceContext; +import com.intellij.uiDesigner.propertyInspector.PropertyEditor; import com.intellij.uiDesigner.propertyInspector.renderers.ColorRenderer; import com.intellij.uiDesigner.radComponents.RadComponent; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.colorchooser.AbstractColorChooserPanel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.plaf.ColorChooserUI; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.SystemColor; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.*; +import java.util.List; /** * @author yole @@ -238,7 +238,7 @@ public class ColorEditor extends PropertyEditor { getColorSelectionModel().setSelectedColor(new ColorDescriptorWrapper(descriptor)); } }); - add(new JScrollPane(myDescriptorList), BorderLayout.CENTER); + add(new JBScrollPane(myDescriptorList), BorderLayout.CENTER); } public String getDisplayName() { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/FontEditorDialog.form b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/FontEditorDialog.form index 85bf73448dd1..751d3d88ecf0 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/FontEditorDialog.form +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/FontEditorDialog.form @@ -49,7 +49,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -135,7 +135,7 @@ - + diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ListEditorDialog.form b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ListEditorDialog.form index 0a00e92e3e12..e6ec2d05332a 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ListEditorDialog.form +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ListEditorDialog.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.form b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.form index 98ed196c191e..fd0f4cf5b54f 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.form +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.form @@ -58,7 +58,7 @@ - + diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadScrollPane.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadScrollPane.java index e89db7e360f7..1d04c09c951d 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadScrollPane.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadScrollPane.java @@ -16,6 +16,7 @@ package com.intellij.uiDesigner.radComponents; import com.intellij.openapi.module.Module; +import com.intellij.ui.components.JBScrollPane; import com.intellij.uiDesigner.UIFormXmlConstants; import com.intellij.uiDesigner.XmlWriter; import com.intellij.uiDesigner.core.GridConstraints; @@ -36,7 +37,7 @@ import java.awt.*; * @author Vladimir Kondratyev */ public final class RadScrollPane extends RadContainer { - public static final Class COMPONENT_CLASS = JScrollPane.class; + public static final Class COMPONENT_CLASS = JBScrollPane.class; public static class Factory extends RadComponentFactory { public RadComponent newInstance(Module module, Class aClass, String id) { @@ -64,7 +65,7 @@ public final class RadScrollPane extends RadContainer { public void write(final XmlWriter writer) { writer.startElement(UIFormXmlConstants.ELEMENT_SCROLLPANE); try { - writeNoLayout(writer, JScrollPane.class.getName()); + writeNoLayout(writer, JBScrollPane.class.getName()); } finally { writer.endElement(); // scrollpane } @@ -76,7 +77,7 @@ public final class RadScrollPane extends RadContainer { @Override protected void importSnapshotComponent(final SnapshotContext context, final JComponent component) { - JScrollPane scrollPane = (JScrollPane) component; + JBScrollPane scrollPane = (JBScrollPane) component; final Component view = scrollPane.getViewport().getView(); if (view instanceof JComponent) { RadComponent childComponent = createSnapshotComponent(context, (JComponent) view); @@ -105,14 +106,14 @@ public final class RadScrollPane extends RadContainer { } public void addComponentToContainer(final RadContainer container, final RadComponent component, final int index) { - final JScrollPane scrollPane = (JScrollPane)container.getDelegee(); + final JBScrollPane scrollPane = (JBScrollPane)container.getDelegee(); final JComponent delegee = component.getDelegee(); delegee.setLocation(0,0); scrollPane.setViewportView(delegee); } @Override public void removeComponentFromContainer(final RadContainer container, final RadComponent component) { - final JScrollPane scrollPane = (JScrollPane)container.getDelegee(); + final JBScrollPane scrollPane = (JBScrollPane)container.getDelegee(); scrollPane.setViewportView(null); } } 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 2e65436c94ab..78ab96b48dd2 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java @@ -52,6 +52,7 @@ 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; @@ -434,7 +435,7 @@ public class CreateSnapShotAction extends AnAction { while(componentClass != null) { if (JPanel.class.getName().equals(componentClass.getQualifiedName()) || JTabbedPane.class.getName().equals(componentClass.getQualifiedName()) || - JScrollPane.class.getName().equals(componentClass.getQualifiedName()) || + JBScrollPane.class.getName().equals(componentClass.getQualifiedName()) || JSplitPane.class.getName().equals(componentClass.getQualifiedName())) { return true; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotForm.form b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotForm.form index 600eadee5131..a8d04692ea9d 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotForm.form +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotForm.form @@ -8,7 +8,7 @@ - + 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 6334cfb4b026..3cff402afbd4 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterDaemon.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterDaemon.java @@ -17,6 +17,7 @@ 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; @@ -166,8 +167,8 @@ public class SnapShooterDaemon implements Runnable { children.add(splitPane.getRightComponent()); } } - else if (parent instanceof JScrollPane) { - JScrollPane scrollPane = (JScrollPane) parent; + else if (parent instanceof JBScrollPane) { + JBScrollPane scrollPane = (JBScrollPane) parent; children.add(scrollPane.getViewport().getView()); } else if (parent instanceof Container) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.form b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.form index a47af9ed2a40..6a52b05d050b 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.form +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.form @@ -9,7 +9,7 @@ - + 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 563ef10c90da..35946d165ab6 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java @@ -22,10 +22,11 @@ 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.NotNull; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.table.AbstractTableModel; @@ -42,7 +43,7 @@ import java.util.Collections; final class BindToExistingBeanStep extends StepAdapter{ private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.wizard.BindToExistingBeanStep"); - private JScrollPane myScrollPane; + private JBScrollPane myScrollPane; private JTable myTable; private final WizardData myData; private final MyTableModel myTableModel; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.form b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.form index 65e702be1ff6..b6eabd7edad2 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.form +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.form @@ -9,7 +9,7 @@ - + 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 068bf0f1fed7..6858e474cef8 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java @@ -21,6 +21,7 @@ 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; @@ -36,7 +37,7 @@ import javax.swing.table.TableColumn; final class BindToNewBeanStep extends StepAdapter{ private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.wizard.BindToNewBeanStep"); - private JScrollPane myScrollPane; + private JBScrollPane myScrollPane; private JTable myTable; private final WizardData myData; private final MyTableModel myTableModel; @@ -169,4 +170,4 @@ final class BindToNewBeanStep extends StepAdapter{ } } } -} \ No newline at end of file +} diff --git a/plugins/ui-designer/src/gui-designer-properties.xml b/plugins/ui-designer/src/gui-designer-properties.xml index 0aaf1144d061..e15c6586ddc5 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 f29d9b7bc44b..30225ce92239 100644 --- a/plugins/ui-designer/testData/ChainedConstructorTest.java +++ b/plugins/ui-designer/testData/ChainedConstructorTest.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import com.intellij.ui.components.JBScrollPane; + import javax.swing.*; -import java.awt.*; public class ChainedConstructorTest { private JComponent myRootComponent; - public JScrollPane myScrollPane; + public JBScrollPane myScrollPane; public JList myList; public ChainedConstructorTest() { @@ -29,4 +30,4 @@ public class ChainedConstructorTest { myList = new JBList(); myScrollPane.setViewportView(myList); } -} \ No newline at end of file +} diff --git a/plugins/ui-designer/testData/TestChainedConstructor.form b/plugins/ui-designer/testData/TestChainedConstructor.form index 7224d51c5998..0bc652e59c03 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 fb1ef7493e1e..ac753233a6d1 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 fce2e496ce76..4cc66bd6f340 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 3f158c997295..a7f99175f1f0 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java @@ -17,6 +17,7 @@ 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; @@ -215,7 +216,7 @@ public class AsmCodeGeneratorTest extends TestCase { } public void testScrollPane() throws Exception { - JScrollPane scrollPane = (JScrollPane)getInstrumentedRootComponent("TestScrollPane.form", "BindingTest"); + JBScrollPane scrollPane = (JBScrollPane)getInstrumentedRootComponent("TestScrollPane.form", "BindingTest"); assertTrue(scrollPane.getViewport().getView() instanceof JList); } @@ -290,7 +291,7 @@ public class AsmCodeGeneratorTest extends TestCase { Class cls = loadAndPatchClass("TestChainedConstructor.form", "ChainedConstructorTest"); Field scrollPaneField = cls.getField("myScrollPane"); Object instance = cls.newInstance(); - JScrollPane scrollPane = (JScrollPane) scrollPaneField.get(instance); + JBScrollPane scrollPane = (JBScrollPane) scrollPaneField.get(instance); assertNotNull(scrollPane.getViewport().getView()); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/EditAssociations.form b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/EditAssociations.form index 41a2ea4cfd93..75aa0c666ad2 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/EditAssociations.form +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/EditAssociations.form @@ -39,7 +39,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form index 8df8114f5fbc..1bbb11d7078d 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form @@ -166,7 +166,7 @@ - + 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 696e98f318d5..40fe64383d5a 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,6 +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.util.containers.BidirectionalMap; import com.intellij.util.ui.Table; import org.intellij.lang.xpath.XPathFileType; @@ -129,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 JScrollPane(myVariableTable), BorderLayout.CENTER); + p.add(new JBScrollPane(myVariableTable), BorderLayout.CENTER); int extendedState = myDimensionService.getExtendedState(getDimensionServiceKey()); if (extendedState == -1) extendedState = 400; @@ -178,7 +179,7 @@ public class EditContextDialog extends DialogWrapper { n.add(nsToolbar, BorderLayout.NORTH); } - n.add(new JScrollPane(myNamespaceTable), BorderLayout.CENTER); + n.add(new JBScrollPane(myNamespaceTable), BorderLayout.CENTER); mySplitter.setFirstComponent(n); mySplitter.setSecondComponent(p); diff --git a/resources/src/idea/Palette2.xml b/resources/src/idea/Palette2.xml index 5bdd576d30e3..e0b8e249b0bc 100644 --- a/resources/src/idea/Palette2.xml +++ b/resources/src/idea/Palette2.xml @@ -22,7 +22,7 @@ - \ No newline at end of file + diff --git a/xml/impl/src/com/intellij/application/options/TagListDialog.java b/xml/impl/src/com/intellij/application/options/TagListDialog.java index 7b1b36f8953a..c4703d9bc5e7 100644 --- a/xml/impl/src/com/intellij/application/options/TagListDialog.java +++ b/xml/impl/src/com/intellij/application/options/TagListDialog.java @@ -21,6 +21,7 @@ import com.intellij.openapi.roots.ui.configuration.actions.IconWithTextAction; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.ui.components.JBList; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Icons; import javax.swing.*; @@ -61,7 +62,7 @@ public class TagListDialog extends DialogWrapper{ } private JComponent createList() { - return new JScrollPane(myList); + return new JBScrollPane(myList); } private JComponent createToolbal() {