From 0edb2b011e7d8c8f73eb97909bb759b4545eb790 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Tue, 29 Jun 2010 11:19:06 +0400 Subject: [PATCH] JList->JBList --- .../images/thumbnail/impl/ThumbnailViewUI.java | 3 ++- .../com/intellij/execution/filters/YourkitFilter.java | 3 ++- .../ide/palette/impl/PaletteComponentList.java | 3 ++- .../ide/util/importProject/ProjectLayoutPanel.java | 3 ++- .../ide/util/projectWizard/JdkChooserPanel.java | 3 ++- .../ide/util/projectWizard/ModuleTypeStep.java | 3 ++- .../intellij/openapi/projectRoots/ui/PathEditor.java | 3 ++- .../openapi/roots/ui/configuration/SidePanel.java | 3 ++- .../com/intellij/projectImport/ImportChooserStep.java | 3 ++- .../options/CodeStyleGenerationConfigurable.java | 3 ++- .../daemon/impl/quickfix/CreateFromUsageBaseFix.java | 3 ++- .../impl/quickfix/CreateInnerClassFromUsageFix.java | 3 ++- .../editorActions/RestoreReferencesDialog.java | 3 ++- .../codeInsight/generation/ui/SimpleFieldChooser.java | 3 ++- .../ChooseClassAndDoHighlightRunnable.java | 3 ++- .../impl/CopyAbstractMethodImplementationHandler.java | 3 ++- .../impl/ImplementAbstractMethodHandler.java | 3 ++- .../javaDoc/JavaDocReferenceInspection.java | 3 ++- .../codeInspection/util/SpecialAnnotationsUtil.java | 3 ++- .../EnclosingMethodSelectionDialog.java | 3 ++- .../MoveInstanceMethodDialogBase.java | 3 ++- .../turnRefsToSuper/TurnRefsToSuperDialog.java | 3 ++- .../BaseGenerateTestSupportMethodAction.java | 3 ++- .../src/com/intellij/unscramble/ThreadDumpPanel.java | 6 +++--- .../application/options/colors/OptionsPanelImpl.java | 3 ++- .../daemon/impl/PsiElementListNavigator.java | 3 ++- .../intellij/codeInsight/lookup/impl/LookupImpl.java | 3 ++- .../codeInsight/navigation/NavigationUtil.java | 3 ++- .../intellij/codeInsight/unwrap/UnwrapHandler.java | 3 ++- .../codeInspection/ex/SeverityEditorDialog.java | 3 ++- .../execution/ui/CommonProgramParametersPanel.java | 3 ++- .../src/com/intellij/find/EditorSearchComponent.java | 5 +++-- .../ide/bookmarks/actions/BookmarksAction.java | 3 ++- .../com/intellij/ide/commander/CommanderPanel.java | 6 +++--- .../ide/fileTemplates/impl/FileTemplateTabAsList.java | 3 ++- .../src/com/intellij/ide/macro/MacrosDialog.java | 5 +++-- .../ide/projectView/impl/ProjectViewImpl.java | 3 ++- .../ide/util/gotoByName/ChooseByNameBase.java | 3 ++- .../intellij/internal/psiView/PsiViewerDialog.java | 3 ++- .../impl/http/JumpFromRemoteFileToLocalAction.java | 3 ++- .../intellij/refactoring/IntroduceTargetChooser.java | 3 ++- .../src/com/intellij/tools/OutputFiltersDialog.java | 3 ++- .../ui/debugger/extensions/FocusDebugger.java | 3 ++- .../ui/debugger/extensions/PlaybackDebugger.java | 3 ++- .../util/ui/classpath/SimpleClasspathPanel.java | 3 ++- .../integration/ui/views/RecentChangesPopup.java | 3 ++- .../openapi/editor/actions/ContentChooser.java | 3 ++- .../com/intellij/openapi/ui/SelectFromListDialog.java | 3 ++- .../src/com/intellij/ui/AddDeleteListPanel.java | 3 ++- .../src/com/intellij/ui/CheckBoxList.java | 3 ++- .../src/com/intellij/ui/OptionalChooserComponent.form | 0 .../src/com/intellij/ui/OptionalChooserComponent.java | 2 +- .../src/com/intellij/ui/SearchTextField.java | 3 ++- .../src/com/intellij/ui/components/JBList.java | 11 +++++++++-- .../application/options/SchemesToImportPopup.java | 3 ++- .../application/options/SelectFontDialog.java | 3 ++- .../ide/actions/BaseShowRecentFilesAction.java | 3 ++- .../com/intellij/ide/actions/ToolWindowSwitcher.java | 5 +++-- .../highlighter/custom/impl/CustomFileTypeEditor.java | 3 ++- .../src/com/intellij/ide/ui/search/SearchUtil.java | 3 ++- .../notification/impl/ui/NotificationsListPanel.java | 3 ++- .../openapi/fileChooser/ex/FileTextFieldImpl.java | 3 ++- .../intellij/openapi/keymap/impl/ui/KeymapPanel.java | 3 ++- .../openapi/keymap/impl/ui/QuickListsPanel.java | 5 +++-- .../src/com/intellij/ui/ListToolTipHandler.java | 4 ++-- .../src/com/intellij/ui/TableToolTipHandler.java | 2 +- .../platform-impl/src/com/intellij/ui/TreeList.java | 3 ++- .../src/com/intellij/ui/TreeToolTipHandler.java | 2 +- .../src/com/intellij/ui/popup/list/ListPopupImpl.java | 3 ++- .../changes/committed/ColumnFilteringStrategy.java | 3 ++- .../xdebugger/impl/frame/DebuggerFramesList.java | 4 ++-- .../testAssistant/TestDataNavigationHandler.java | 3 ++- .../intelliLang/inject/InjectLanguageAction.java | 3 ++- .../ant/config/explorer/SaveMetaTargetDialog.java | 3 ++- .../config/ui/CvsConfigurationsListEditor.java | 3 ++- .../config/ui/SelectCvsConfgurationPanel.java | 3 ++- .../cvsTagOrBranch/ui/SelectTagDialog.java | 3 ++- .../cvsoperations/cvsTagOrBranch/ui/TagsPanel.java | 3 ++- .../ui/experts/checkout/ChooseCheckoutMode.java | 3 ++- .../quickfix/CreateHtmlDescriptionFix.java | 3 ++- plugins/devkit/src/util/ChooseModulesDialog.java | 3 ++- .../src/git4idea/history/browser/GitLogTree.java | 3 ++- .../history/browser/SelectGitBranchesPopup.java | 3 ++- .../src/git4idea/history/browser/UsersPopup.java | 3 ++- .../intentions/GroovyStaticImportMethodFix.java | 3 ++- .../plugins/groovy/doc/GroovyDocGenerationPanel.java | 3 ++- .../zmlx/hg4idea/ui/HgRunConflictResolverDialog.java | 3 ++- .../execution/junit2/configuration/MethodListDlg.java | 3 ++- .../jetbrains/idea/svn/actions/SelectBranchPopup.java | 3 ++- .../testng/configuration/browser/GroupList.java | 3 ++- .../testng/configuration/browser/MethodList.java | 3 ++- .../propertyInspector/editors/ColorEditor.java | 3 ++- .../ui-designer/testData/ChainedConstructorTest.java | 2 +- .../intellij/application/options/TagListDialog.java | 3 ++- .../analysis/CreateNSDeclarationIntentionFix.java | 3 ++- .../daemon/impl/analysis/ImportNSAction.java | 3 ++- 96 files changed, 199 insertions(+), 106 deletions(-) rename platform/{util => platform-api}/src/com/intellij/ui/CheckBoxList.java (97%) rename platform/{util => platform-api}/src/com/intellij/ui/OptionalChooserComponent.form (100%) rename platform/{util => platform-api}/src/com/intellij/ui/OptionalChooserComponent.java (96%) diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java index 2de28dd40660..c32a1893a5f3 100644 --- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java +++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java @@ -32,6 +32,7 @@ import com.intellij.pom.Navigatable; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; +import com.intellij.ui.components.JBList; import org.intellij.images.fileTypes.ImageFileTypeManager; import org.intellij.images.options.*; import org.intellij.images.thumbnail.ThumbnailView; @@ -116,7 +117,7 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable { options.addPropertyChangeListener(optionsListener); - list = new JList(); + list = new JBList(); list.setModel(new DefaultListModel()); list.setLayoutOrientation(JList.HORIZONTAL_WRAP); list.setVisibleRowCount(-1); diff --git a/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java b/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java index 45d5c3402b7a..b12de6607f4f 100644 --- a/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java +++ b/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java @@ -26,6 +26,7 @@ import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.pom.Navigatable; import com.intellij.psi.*; import com.intellij.psi.search.PsiShortNamesCache; +import com.intellij.ui.components.JBList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -85,7 +86,7 @@ public class YourkitFilter implements Filter{ public void navigate(final Project project) { DefaultPsiElementListCellRenderer renderer = new DefaultPsiElementListCellRenderer(); - final JList list = new JList(myPsiFiles); + final JList list = new JBList(myPsiFiles); list.setCellRenderer(renderer); final PopupChooserBuilder builder = new PopupChooserBuilder(list); diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteComponentList.java b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteComponentList.java index 29ea375e0444..1afab4aba0f9 100644 --- a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteComponentList.java +++ b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteComponentList.java @@ -26,6 +26,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.PopupHandler; +import com.intellij.ui.components.JBList; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -38,7 +39,7 @@ import java.awt.event.*; /** * @author yole */ -public class PaletteComponentList extends JList { +public class PaletteComponentList extends JBList { private final Project myProject; private final PaletteGroup myGroup; private int myHoverIndex = -1; 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 01f462eb8997..e2d389b8638c 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java @@ -23,6 +23,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.ui.ex.MultiLineLabel; import com.intellij.openapi.util.IconLoader; +import com.intellij.ui.components.JBList; import com.intellij.util.Icons; import com.intellij.util.StringBuilderSpinAllocator; import org.jetbrains.annotations.Nullable; @@ -133,7 +134,7 @@ abstract class ProjectLayoutPanel extends JPanel { } private JList createList() { - final JList list = new JList(new DefaultListModel()); + final JList list = new JBList(new DefaultListModel()); list.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); list.setCellRenderer(new MyListCellRenderer()); return list; 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 84d060d79c48..c86e803b19b0 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java @@ -30,6 +30,7 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectJdksModel; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.wm.ex.WindowManagerEx; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import gnu.trove.TIntArrayList; import org.jetbrains.annotations.Nullable; @@ -54,7 +55,7 @@ public class JdkChooserPanel extends JPanel { super(new BorderLayout()); myProject = project; myListModel = new DefaultListModel(); - myList = new JList(myListModel); + myList = new JBList(myListModel); myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myList.setCellRenderer(new ProjectJdkListRenderer()); //noinspection HardCodedStringLiteral 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 4f2468459228..291b1bb4cd68 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleTypeStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ModuleTypeStep.java @@ -29,6 +29,7 @@ import com.intellij.openapi.ui.Messages; 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.util.EventDispatcher; import com.intellij.util.ui.UIUtil; @@ -91,7 +92,7 @@ public class ModuleTypeStep extends ModuleWizardStep { final ModuleType[] allModuleTypes = ModuleTypeManager.getInstance().getRegisteredTypes(); - myTypesList = new JList(allModuleTypes); + myTypesList = new JBList(allModuleTypes); myTypesList.setSelectionModel(new PermanentSingleSelectionModel()); myTypesList.setCellRenderer(new ModuleTypesListCellRenderer()); myTypesList.addListSelectionListener(new ListSelectionListener() { 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 9ae5ada1ad55..bd91db835dd9 100644 --- a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/PathEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/PathEditor.java @@ -33,6 +33,7 @@ import com.intellij.openapi.vfs.VirtualFile; 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.util.Icons; import com.intellij.util.containers.HashSet; import com.intellij.util.ui.UIUtil; @@ -128,7 +129,7 @@ public abstract class PathEditor { Insets anInsets = new Insets(2, 2, 2, 2); myModel = new DefaultListModel(); - myList = new JList(myModel); + myList = new JBList(myModel); myList.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ public void valueChanged(ListSelectionEvent e){ updateButtons(); 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 5d24412744b4..c00ec47cc2fa 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java @@ -17,6 +17,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.navigation.History; import com.intellij.ui.navigation.Place; import com.intellij.ui.popup.list.GroupedItemsListRenderer; @@ -49,7 +50,7 @@ public class SidePanel extends JPanel { setLayout(new BorderLayout()); myModel = new DefaultListModel(); - myList = new JList(myModel); + myList = new JBList(myModel); final ListItemDescriptor descriptor = new ListItemDescriptor() { public String getTextFor(final Object value) { diff --git a/java/idea-ui/src/com/intellij/projectImport/ImportChooserStep.java b/java/idea-ui/src/com/intellij/projectImport/ImportChooserStep.java index f12e14120e10..ca6a78393e69 100644 --- a/java/idea-ui/src/com/intellij/projectImport/ImportChooserStep.java +++ b/java/idea-ui/src/com/intellij/projectImport/ImportChooserStep.java @@ -25,6 +25,7 @@ import com.intellij.ide.util.newProjectWizard.StepSequence; import com.intellij.ide.util.projectWizard.WizardContext; import com.intellij.openapi.util.Comparing; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.ui.components.JBList; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -48,7 +49,7 @@ public class ImportChooserStep extends ProjectImportWizardStep { mySequence = sequence; myPanel = new JPanel(new BorderLayout()); final DefaultListModel model = new DefaultListModel(); - myList = new JList(model); + myList = new JBList(model); for (ProjectImportProvider provider : sorted(providers)) { model.addElement(provider); 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 081345f1510e..5ed0323ecfd0 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.java @@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.ui.ListUtil; +import com.intellij.ui.components.JBList; import javax.swing.*; import java.awt.event.ActionEvent; @@ -304,7 +305,7 @@ public class CodeStyleGenerationConfigurable implements Configurable { return !textField.getText().trim().equals(value); } - private static class MembersOrderList extends JList { + private static class MembersOrderList extends JBList { private static abstract class PropertyManager { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java index e02d3ccda4b7..5321916416ce 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java @@ -35,6 +35,7 @@ import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.ui.components.JBList; import com.intellij.util.IncorrectOperationException; import com.intellij.util.VisibilityUtil; import org.jetbrains.annotations.NonNls; @@ -111,7 +112,7 @@ public abstract class CreateFromUsageBaseFix extends BaseIntentionAction { private void chooseTargetClass(List classes, final Editor editor) { final Project project = classes.get(0).getProject(); - final JList list = new JList(new Vector(classes)); + final JList list = new JBList(classes); PsiElementListCellRenderer renderer = new PsiClassListCellRenderer(); list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.setCellRenderer(renderer); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java index 71d688822d84..b5c1a885d02c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java @@ -28,6 +28,7 @@ import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.ui.components.JBList; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -89,7 +90,7 @@ public class CreateInnerClassFromUsageFix extends CreateClassFromUsageBaseFix { private void chooseTargetClass(PsiClass[] classes, final Editor editor, final String superClassName) { final Project project = classes[0].getProject(); - final JList list = new JList(classes); + final JList list = new JBList(classes); PsiElementListCellRenderer renderer = new PsiClassListCellRenderer(); list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.setCellRenderer(renderer); 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 3cb17892128b..f13e566292a5 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java @@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.VerticalFlowLayout; import com.intellij.psi.PsiClass; +import com.intellij.ui.components.JBList; import javax.swing.*; import java.awt.*; @@ -61,7 +62,7 @@ class RestoreReferencesDialog extends DialogWrapper { protected JComponent createCenterPanel() { final JPanel panel = new JPanel(new BorderLayout()); - myList = new JList(myNamedElements); + myList = new JBList(myNamedElements); myList.setCellRenderer(new FQNameCellRenderer()); myList.setBorder(BorderFactory.createEtchedBorder()); panel.add(new JScrollPane(myList), BorderLayout.CENTER); diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/ui/SimpleFieldChooser.java b/java/java-impl/src/com/intellij/codeInsight/generation/ui/SimpleFieldChooser.java index fb0b9c156931..d4c8fc9bfe96 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/ui/SimpleFieldChooser.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/ui/SimpleFieldChooser.java @@ -21,6 +21,7 @@ import com.intellij.psi.PsiField; import com.intellij.psi.PsiNamedElement; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.util.PsiFormatUtil; +import com.intellij.ui.components.JBList; import javax.swing.*; import java.awt.*; @@ -45,7 +46,7 @@ public class SimpleFieldChooser extends DialogWrapper { for (PsiField member : myFields) { model.addElement(member); } - myList = new JList(model); + myList = new JBList(model); myList.setCellRenderer(new MyListCellRenderer()); myList.addMouseListener( new MouseAdapter() { diff --git a/java/java-impl/src/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java index 0892d0f94ae1..d7335f8b4877 100644 --- a/java/java-impl/src/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java +++ b/java/java-impl/src/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java @@ -22,6 +22,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClassType; +import com.intellij.ui.components.JBList; import javax.swing.*; import java.util.ArrayList; @@ -75,7 +76,7 @@ public abstract class ChooseClassAndDoHighlightRunnable implements Runnable { Vector model = new Vector(Arrays.asList(myClasses)); model.insertElementAt(CodeInsightBundle.message("highlight.thrown.exceptions.chooser.all.entry"), 0); - myList = new JList(model); + myList = new JBList(model); myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myList.setCellRenderer(renderer); diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java index ebd2843f0184..a0ecc01452c4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java @@ -35,6 +35,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.psi.*; import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.psi.util.TypeConversionUtil; +import com.intellij.ui.components.JBList; import com.intellij.util.IncorrectOperationException; import javax.swing.*; @@ -82,7 +83,7 @@ public class CopyAbstractMethodImplementationHandler { } }); final PsiMethod[] methodArray = mySourceMethods.toArray(new PsiMethod[mySourceMethods.size()]); - final JList list = new JList(methodArray); + final JList list = new JBList(methodArray); list.setCellRenderer(new MethodCellRenderer(true)); final Runnable runnable = new Runnable() { public void run() { diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java index 14206307384f..086e47094078 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java @@ -43,6 +43,7 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; import com.intellij.psi.search.searches.ClassInheritorsSearch; +import com.intellij.ui.components.JBList; import com.intellij.util.IncorrectOperationException; import javax.swing.*; @@ -93,7 +94,7 @@ public class ImplementAbstractMethodHandler { PsiClassListCellRenderer renderer = new PsiClassListCellRenderer(); Arrays.sort(result[0], renderer.getComparator()); - myList = new JList(result[0]); + myList = new JBList(result[0]); myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myList.setCellRenderer(renderer); diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java index 895c921d2978..f014c86a0349 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java @@ -38,6 +38,7 @@ import com.intellij.psi.*; import com.intellij.psi.javadoc.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.proximity.PsiProximityComparator; +import com.intellij.ui.components.JBList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -236,7 +237,7 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool { if (element instanceof PsiJavaCodeReferenceElement) { final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)element; Collections.sort(myClassesToImport, new PsiProximityComparator(referenceElement.getElement())); - final JList list = new JList(myClassesToImport.toArray(new PsiClass[myClassesToImport.size()])); + final JList list = new JBList(myClassesToImport.toArray(new PsiClass[myClassesToImport.size()])); list.setCellRenderer(new FQNameCellRenderer()); Runnable runnable = new Runnable() { public void run() { 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 33ce2967d30e..ae8060c18818 100644 --- a/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java +++ b/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java @@ -39,6 +39,7 @@ import com.intellij.ui.ReorderableListController; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SeparatorFactory; import com.intellij.ui.SortedListModel; +import com.intellij.ui.components.JBList; import com.intellij.util.IncorrectOperationException; import com.intellij.util.Processor; import org.jetbrains.annotations.NonNls; @@ -62,7 +63,7 @@ public class SpecialAnnotationsUtil { return o1.compareTo(o2); } }); - final JList injectionList = new JList(listModel); + final JList injectionList = new JBList(listModel); for (String s : list) { listModel.add(s); } 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 7657501cbc30..a7c4f51cc4b7 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java @@ -30,6 +30,7 @@ import com.intellij.psi.PsiMethod; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.ui.MethodCellRenderer; import com.intellij.ui.IdeBorderFactory; +import com.intellij.ui.components.JBList; import javax.swing.*; import java.awt.*; @@ -86,7 +87,7 @@ public class EnclosingMethodSelectionDialog extends DialogWrapper { panel.add(new JLabel(RefactoringBundle.message("introduce.parameter.to.method")), gbConstraints); gbConstraints.weighty = 1; - myEnclosingMethodsList = new JList(myEnclosingMethods.toArray()); + myEnclosingMethodsList = new JBList(myEnclosingMethods.toArray()); myEnclosingMethodsList.setCellRenderer(new MethodCellRenderer()); myEnclosingMethodsList.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); 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 7d1769b99ddd..4c2cd0817f7d 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java @@ -27,6 +27,7 @@ import com.intellij.refactoring.RefactoringBundle; 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.usageView.UsageViewUtil; import javax.swing.*; @@ -81,7 +82,7 @@ public abstract class MoveInstanceMethodDialogBase extends RefactoringDialog { } protected JList createTargetVariableChooser() { - final JList list = new JList(new MyListModel()); + final JList list = new JBList(new MyListModel()); list.setCellRenderer(new MyListCellRenderer()); list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.setSelectedIndex(0); 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 c168d03224ca..76f60fc60bd3 100644 --- a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java @@ -34,6 +34,7 @@ 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 org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -96,7 +97,7 @@ public class TurnRefsToSuperDialog extends RefactoringDialog { final JLabel classListLabel = new JLabel(); panel.add(classListLabel, gbConstraints); - mySuperClassesList = new JList(mySuperClasses.toArray()); + mySuperClassesList = new JBList(mySuperClasses.toArray()); mySuperClassesList.setCellRenderer(new ClassCellRenderer()); mySuperClassesList.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); classListLabel.setText(RefactoringBundle.message("turnRefsToSuper.change.usages.to", mySubClass.getQualifiedName())); diff --git a/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java b/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java index a234a4ee7301..3cc4d9e34623 100644 --- a/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java +++ b/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java @@ -29,6 +29,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.ui.components.JBList; import com.intellij.util.Function; import com.intellij.util.IncorrectOperationException; import com.intellij.util.SmartList; @@ -108,7 +109,7 @@ public class BaseGenerateTestSupportMethodAction extends BaseGenerateAction { return; } - final JList list = new JList(frameworks.toArray(new TestFramework[frameworks.size()])); + final JList list = new JBList(frameworks.toArray(new TestFramework[frameworks.size()])); list.setCellRenderer(new DefaultListCellRenderer() { @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { diff --git a/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java b/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java index 8d37dc610297..d53af0eb4bfd 100644 --- a/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java +++ b/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java @@ -25,6 +25,7 @@ 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.components.JBList; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -57,7 +58,7 @@ public class ThreadDumpPanel extends JPanel { private static final Icon EDT_BUSY_ICON_DAEMON = new LayeredIcon(EDT_BUSY_ICON, DAEMON); private static final Icon IO_ICON = IconLoader.getIcon("/debugger/threadStates/io.png"); private static final Icon IO_ICON_DAEMON = new LayeredIcon(IO_ICON, DAEMON); - private final JList myThreadList; + private final JBList myThreadList; public ThreadDumpPanel(Project project, final ConsoleView consoleView, final DefaultActionGroup toolbarActions, final List threadDump) { super(new BorderLayout()); @@ -66,7 +67,7 @@ public class ThreadDumpPanel extends JPanel { for (ThreadState threadState : data) { model.addElement(threadState); } - myThreadList = new JList(model); + myThreadList = new JBList(model); myThreadList.setCellRenderer(new ThreadListCellRenderer()); myThreadList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myThreadList.addListSelectionListener(new ListSelectionListener() { @@ -82,7 +83,6 @@ public class ThreadDumpPanel extends JPanel { myThreadList.repaint(); } }); - ListToolTipHandler.install(myThreadList); toolbarActions.add(new CopyToClipboardAction(threadDump, project)); toolbarActions.add(new SortThreadsAction()); add(ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, toolbarActions,false).getComponent(), BorderLayout.WEST); 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 feb1029ba9a8..f4adb3ee3670 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/OptionsPanelImpl.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/OptionsPanelImpl.java @@ -17,6 +17,7 @@ package com.intellij.application.options.colors; import com.intellij.ui.ListScrollingUtil; +import com.intellij.ui.components.JBList; import com.intellij.util.EventDispatcher; import javax.swing.*; @@ -51,7 +52,7 @@ public class OptionsPanelImpl extends JPanel implements OptionsPanel { } }); - myOptionsList = new JList(); + myOptionsList = new JBList(); myOptionsList.addListSelectionListener(new ListSelectionListener() { public void valueChanged(ListSelectionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java index b74b08081137..7e147ae691c6 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PsiElementListNavigator.java @@ -22,6 +22,7 @@ import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.psi.NavigatablePsiElement; import com.intellij.psi.PsiElement; import com.intellij.ui.awt.RelativePoint; +import com.intellij.ui.components.JBList; import javax.swing.*; import java.awt.event.MouseEvent; @@ -38,7 +39,7 @@ public class PsiElementListNavigator { targets[0].navigate(true); } else{ - final JList list = new JList(targets); + final JList list = new JBList(targets); list.setCellRenderer(listRenderer); final PopupChooserBuilder builder = new PopupChooserBuilder(list); 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 825a855c88b7..a8fadc00d060 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java @@ -40,6 +40,7 @@ import com.intellij.psi.PsiElement; 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.plaf.beg.BegPopupMenuBorder; import com.intellij.ui.popup.PopupIcons; import com.intellij.util.CollectConsumer; @@ -116,7 +117,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { myProcessIcon = new AsyncProcessIcon("Completion progress"); myProcessIcon.setVisible(false); - myList = new JList(new DefaultListModel()); + myList = new JBList(new DefaultListModel()); myCellRenderer = new LookupCellRenderer(this); myList.setCellRenderer(myCellRenderer); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java index d6f3f221176c..941246d16fa8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationUtil.java @@ -33,6 +33,7 @@ import com.intellij.pom.Navigatable; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.search.PsiElementProcessor; +import com.intellij.ui.components.JBList; import javax.swing.*; @@ -62,7 +63,7 @@ public final class NavigationUtil { public static JBPopup getPsiElementPopup(final T[] elements, final PsiElementListCellRenderer renderer, final String title, final PsiElementProcessor processor) { - final JList list = new JList(elements); + final JList list = new JBList(elements); list.setCellRenderer(renderer); final Runnable runnable = new Runnable() { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/unwrap/UnwrapHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/unwrap/UnwrapHandler.java index 9fd3f1f95c3e..eb298c300ac4 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/unwrap/UnwrapHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/unwrap/UnwrapHandler.java @@ -37,6 +37,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.impl.source.tree.RecursiveTreeElementWalkingVisitor; import com.intellij.psi.impl.source.tree.TreeElement; +import com.intellij.ui.components.JBList; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -97,7 +98,7 @@ public class UnwrapHandler implements CodeInsightActionHandler { m.addElement(((MyUnwrapAction)a).getName()); } - final JList list = new JList(m); + final JList list = new JBList(m); list.setVisibleRowCount(options.size()); list.addListSelectionListener(new ListSelectionListener() { 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 f77107c9952b..5565b2a3ce8f 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java @@ -48,6 +48,7 @@ import com.intellij.openapi.util.IconLoader; import com.intellij.ui.LightColors; import com.intellij.ui.ListUtil; import com.intellij.ui.ReorderableListController; +import com.intellij.ui.components.JBList; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -68,7 +69,7 @@ import java.util.List; public class SeverityEditorDialog extends DialogWrapper { private final JPanel myPanel; - private final JList myOptionsList = new JList(); + private final JList myOptionsList = new JBList(); private final ColorAndFontDescriptionPanel myOptionsPanel = new ColorAndFontDescriptionPanel(); private SeverityRegistrar.SeverityBasedTextAttributes myCurrentSelection; diff --git a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java index 1b5a3d37319c..50c0076bd06d 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java @@ -32,6 +32,7 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.RawCommandLineEditor; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import javax.swing.*; @@ -84,7 +85,7 @@ public class CommonProgramParametersPanel extends JPanel { final List macros = new ArrayList(PathMacros.getInstance().getUserMacroNames()); if (myModuleContext != null) macros.add("MODULE_DIR"); - final JList list = new JList(ArrayUtil.toStringArray(macros)); + final JList list = new JBList(ArrayUtil.toStringArray(macros)); final JBPopup popup = JBPopupFactory.getInstance().createListPopupBuilder(list).setItemChoosenCallback(new Runnable() { public void run() { final Object value = list.getSelectedValue(); diff --git a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java index d8c9f6a532b2..5a23064d7622 100644 --- a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java +++ b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java @@ -51,6 +51,7 @@ import com.intellij.psi.impl.cache.impl.id.IdTableBuilding; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.LightColors; import com.intellij.ui.NonFocusableCheckBox; +import com.intellij.ui.components.JBList; import com.intellij.ui.components.panels.NonOpaquePanel; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; @@ -663,7 +664,7 @@ public class EditorSearchComponent extends JPanel implements DataProvider { private void showHistory(final boolean byClickingToolbarButton) { FeatureUsageTracker.getInstance().triggerFeatureUsed("find.recent.search"); - showCompletionPopup(new JList(ArrayUtil.reverseArray(FindSettings.getInstance().getRecentFindStrings())), "Recent Searches", + showCompletionPopup(new JBList(ArrayUtil.reverseArray(FindSettings.getInstance().getRecentFindStrings())), "Recent Searches", byClickingToolbarButton); } @@ -685,7 +686,7 @@ public class EditorSearchComponent extends JPanel implements DataProvider { } FeatureUsageTracker.getInstance().triggerFeatureUsed("find.completion"); - final JList list = new JList(array) { + final JList list = new JBList(array) { protected void paintComponent(final Graphics g) { UISettings.setupAntialiasing(g); super.paintComponent(g); diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java index 3b32ed30a308..7471bc5aadd4 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java @@ -51,6 +51,7 @@ import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.FileColorManager; import com.intellij.ui.ListUtil; import com.intellij.ui.SimpleTextAttributes; +import com.intellij.ui.components.JBList; import com.intellij.ui.speedSearch.FilteringListModel; import com.intellij.util.Alarm; import com.intellij.util.Function; @@ -98,7 +99,7 @@ public class BookmarksAction extends AnAction implements DumbAware { final Font font = pathLabel.getFont(); pathLabel.setFont(font.deriveFont((float)10)); - final JList list = new JList(model); + final JList list = new JBList(model); final PreviewPanel previewPanel = new PreviewPanel(project); diff --git a/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java b/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java index 24a3f481ae9f..cda7bb43224f 100644 --- a/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java @@ -47,6 +47,7 @@ import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiUtilBase; import com.intellij.ui.*; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; @@ -75,7 +76,7 @@ public class CommanderPanel extends JPanel { private AbstractListBuilder myBuilder; private JPanel myTitlePanel; private JLabel myParentTitle; - protected final JList myList; + protected final JBList myList; private final MyModel myModel; private CopyPasteDelegator myCopyPasteDelegator; @@ -95,7 +96,7 @@ public class CommanderPanel extends JPanel { super(new BorderLayout()); myProject = project; myModel = new MyModel(); - myList = new JList(myModel); + myList = new JBList(myModel); myList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); if (enablePopupMenu) { @@ -166,7 +167,6 @@ public class CommanderPanel extends JPanel { } }); - ListToolTipHandler.install(myList); } public void addHistoryListener(CommanderHistoryListener listener) { diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTabAsList.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTabAsList.java index fb1fddb4b974..ebea3ccac46a 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTabAsList.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateTabAsList.java @@ -18,6 +18,7 @@ package com.intellij.ide.fileTemplates.impl; import com.intellij.ide.fileTemplates.FileTemplate; import com.intellij.openapi.fileTypes.FileTypeManager; +import com.intellij.ui.components.JBList; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -31,7 +32,7 @@ import java.util.List; * @author Alexey Kudravtsev */ abstract class FileTemplateTabAsList extends FileTemplateTab { - private final JList myList = new JList(); + private final JList myList = new JBList(); private MyListModel myModel; FileTemplateTabAsList(String title) { 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 a4b642788533..a69e5829d9be 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java @@ -23,6 +23,7 @@ import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.ui.components.JBList; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -46,7 +47,7 @@ public final class MacrosDialog extends DialogWrapper { setOKButtonText(IdeBundle.message("button.insert")); myMacrosModel = new DefaultListModel(); - myMacrosList = new JList(myMacrosModel); + myMacrosList = new JBList(myMacrosModel); myPreviewTextarea = new JTextArea(); init(); @@ -59,7 +60,7 @@ public final class MacrosDialog extends DialogWrapper { setOKButtonText(IdeBundle.message("button.insert")); myMacrosModel = new DefaultListModel(); - myMacrosList = new JList(myMacrosModel); + myMacrosList = new JBList(myMacrosModel); myPreviewTextarea = new JTextArea(); init(); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index d7790f098fc9..eaa049ab1d26 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -75,6 +75,7 @@ import com.intellij.psi.util.PsiUtilBase; import com.intellij.ui.AutoScrollFromSourceHandler; import com.intellij.ui.AutoScrollToSourceHandler; import com.intellij.ui.GuiUtils; +import com.intellij.ui.components.JBList; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentManager; import com.intellij.ui.switcher.QuickAccessProvider; @@ -932,7 +933,7 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat views.remove(getCurrentProjectViewPane()); Collections.sort(views, PANE_WEIGHT_COMPARATOR); - final JList list = new JList(ArrayUtil.toObjectArray(views)); + final JList list = new JBList(ArrayUtil.toObjectArray(views)); list.setCellRenderer(new DefaultListCellRenderer() { public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); 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 c88deb758f6e..51d7de4475f3 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 @@ -49,6 +49,7 @@ import com.intellij.psi.statistics.StatisticsManager; import com.intellij.psi.util.proximity.PsiProximityComparator; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.ListScrollingUtil; +import com.intellij.ui.components.JBList; import com.intellij.ui.popup.PopupOwner; import com.intellij.ui.popup.PopupUpdateProcessor; import com.intellij.util.Alarm; @@ -430,7 +431,7 @@ public abstract class ChooseByNameBase{ }); myListModel = new DefaultListModel(); - myList = new JList(myListModel); + myList = new JBList(myListModel); myList.setFocusable(false); myList.setSelectionMode(allowMultipleSelection ? ListSelectionModel.MULTIPLE_INTERVAL_SELECTION : ListSelectionModel.SINGLE_SELECTION); 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 2b18c29161f5..b7d7d8a28a0e 100644 --- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java +++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java @@ -52,6 +52,7 @@ import com.intellij.psi.util.PsiUtilBase; 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.treeStructure.Tree; import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.UIUtil; @@ -144,7 +145,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider { myStructureTreePanel.setLayout(new BorderLayout()); myStructureTreePanel.add(panel, BorderLayout.CENTER); - myRefs = new JList(new DefaultListModel()); + myRefs = new JBList(new DefaultListModel()); JScrollPane refScrollPane = new JScrollPane(myRefs); JPanel refPanel = new JPanel(new BorderLayout()); refPanel.add(refScrollPane, BorderLayout.CENTER); diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/http/JumpFromRemoteFileToLocalAction.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/http/JumpFromRemoteFileToLocalAction.java index 2b329f3c77d4..16be99540888 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/http/JumpFromRemoteFileToLocalAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/http/JumpFromRemoteFileToLocalAction.java @@ -30,6 +30,7 @@ import com.intellij.openapi.vfs.impl.http.RemoteFileState; import com.intellij.psi.search.FilenameIndex; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.ColoredListCellRenderer; +import com.intellij.ui.components.JBList; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -71,7 +72,7 @@ public class JumpFromRemoteFileToLocalAction extends AnAction { navigateToFile(myProject, ContainerUtil.getFirstItem(files, null)); } else { - final JList list = new JList(files.toArray(new VirtualFile[files.size()])); + final JList list = new JBList(files.toArray(new VirtualFile[files.size()])); list.setCellRenderer(new ColoredListCellRenderer() { @Override protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/IntroduceTargetChooser.java b/platform/lang-impl/src/com/intellij/refactoring/IntroduceTargetChooser.java index 7840cd6bc82b..b9cc3ec205f4 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/IntroduceTargetChooser.java +++ b/platform/lang-impl/src/com/intellij/refactoring/IntroduceTargetChooser.java @@ -22,6 +22,7 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.LightweightWindowEvent; import com.intellij.openapi.util.Pass; import com.intellij.psi.PsiElement; +import com.intellij.ui.components.JBList; import com.intellij.util.Function; import javax.swing.*; @@ -42,7 +43,7 @@ public class IntroduceTargetChooser { for (T expr : expressions) { model.addElement(expr); } - final JList list = new JList(model); + final JList list = new JBList(model); list.setCellRenderer(new DefaultListCellRenderer() { @Override diff --git a/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java b/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java index 160f1156c959..f7b4db66ce11 100644 --- a/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java +++ b/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java @@ -22,6 +22,7 @@ package com.intellij.tools; import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.*; +import com.intellij.ui.components.JBList; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -32,7 +33,7 @@ import java.awt.event.ActionListener; class OutputFiltersDialog extends DialogWrapper { private final DefaultListModel myFiltersModel = new DefaultListModel(); - private final JList myFiltersList = new JList(myFiltersModel); + private final JList myFiltersList = new JBList(myFiltersModel); private final JButton myAddButton = new JButton(ToolsBundle.message("tools.filters.add.button")); private final JButton myEditButton = new JButton(ToolsBundle.message("tools.filters.edit.button")); private final JButton myRemoveButton = new JButton(ToolsBundle.message("tools.filters.remove.button")); 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 9b3ce47095df..24f8e6c3b4c9 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 @@ -23,6 +23,7 @@ import com.intellij.openapi.util.IconLoader; 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.debugger.UiDebuggerExtension; import javax.swing.*; @@ -58,7 +59,7 @@ public class FocusDebugger implements UiDebuggerExtension, PropertyChangeListene final JPanel result = new JPanel(new BorderLayout()); myLogModel = new DefaultListModel(); - myLog = new JList(myLogModel); + myLog = new JBList(myLogModel); myLog.setCellRenderer(new FocusElementRenderer()); 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 a18c5dc938e6..cb7ea867415b 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 @@ -42,6 +42,7 @@ import com.intellij.openapi.wm.ex.WindowManagerEx; 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.debugger.UiDebuggerExtension; import com.intellij.util.WaitFor; import com.intellij.util.ui.UIUtil; @@ -143,7 +144,7 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta final Splitter script2Log = new Splitter(true); script2Log.setFirstComponent(new JScrollPane(myEditor.getComponent())); - myList = new JList(myMessage); + myList = new JBList(myMessage); myList.setCellRenderer(new MyListRenderer()); script2Log.setSecondComponent(new JScrollPane(myList)); 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 7482b0df89f7..d0bfe1086de0 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 @@ -31,6 +31,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.ReorderableListController; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.ui.components.JBList; import com.intellij.util.Icons; import com.intellij.util.PathUtil; import gnu.trove.THashSet; @@ -54,7 +55,7 @@ import java.util.List; */ public class SimpleClasspathPanel extends JPanel { - private final JList myList = new JList(); + private final JList myList = new JBList(); private final DefaultListModel myListModel = new DefaultListModel(); private URLClassLoader myClassLoader; private final Disposable myDisposable; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RecentChangesPopup.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RecentChangesPopup.java index 9a212e1b46ad..fecb79954f33 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RecentChangesPopup.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RecentChangesPopup.java @@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.popup.PopupChooserBuilder; +import com.intellij.ui.components.JBList; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -49,7 +50,7 @@ public class RecentChangesPopup { return; } - final JList list = new JList(createModel(cc)); + final JList list = new JBList(createModel(cc)); list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.setCellRenderer(new RecentChangesListCellRenderer()); 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 98e83513e2c7..fa460f934edc 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 @@ -26,6 +26,7 @@ import com.intellij.openapi.util.IconLoader; 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.util.ArrayUtil; import javax.swing.*; @@ -68,7 +69,7 @@ public abstract class ContentChooser extends DialogWrapper { } protected JComponent createCenterPanel() { - myList = new JList(); + myList = new JBList(); myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); rebuildListContent(); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java b/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java index a76e75a6da96..f2d18b4d04c2 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; +import com.intellij.ui.components.JBList; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -31,7 +32,7 @@ import java.awt.*; public class SelectFromListDialog extends DialogWrapper { private final ToStringAspect myToStringAspect; private final DefaultListModel myModel = new DefaultListModel(); - private final JList myList = new JList(myModel); + private final JList myList = new JBList(myModel); private final JPanel myMainPanel = new JPanel(new BorderLayout()); private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.SelectFromListDialog"); diff --git a/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java b/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java index 7c07349aec1c..11aeb9b84797 100644 --- a/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java +++ b/platform/platform-api/src/com/intellij/ui/AddDeleteListPanel.java @@ -17,6 +17,7 @@ package com.intellij.ui; import com.intellij.CommonBundle; +import com.intellij.ui.components.JBList; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -37,7 +38,7 @@ public abstract class AddDeleteListPanel extends PanelWithButtons { protected JButton myAddButton = new JButton(CommonBundle.message("button.add")); protected JButton myDeleteButton = new JButton(CommonBundle.message("button.delete")); protected DefaultListModel myListModel = new DefaultListModel(); - protected JList myList = new JList(myListModel); + protected JList myList = new JBList(myListModel); public AddDeleteListPanel(final String title, final List initialList) { diff --git a/platform/util/src/com/intellij/ui/CheckBoxList.java b/platform/platform-api/src/com/intellij/ui/CheckBoxList.java similarity index 97% rename from platform/util/src/com/intellij/ui/CheckBoxList.java rename to platform/platform-api/src/com/intellij/ui/CheckBoxList.java index 201cd674e3b4..b396274b5194 100644 --- a/platform/util/src/com/intellij/ui/CheckBoxList.java +++ b/platform/platform-api/src/com/intellij/ui/CheckBoxList.java @@ -1,5 +1,6 @@ package com.intellij.ui; +import com.intellij.ui.components.JBList; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -12,7 +13,7 @@ import java.awt.event.*; /** * @author oleg */ -public class CheckBoxList extends JList { +public class CheckBoxList extends JBList { private static final int DEFAULT_CHECK_BOX_WIDTH = 20; public CheckBoxList(final ListModel dataModel, final CheckBoxListListener checkBoxListListener) { diff --git a/platform/util/src/com/intellij/ui/OptionalChooserComponent.form b/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form similarity index 100% rename from platform/util/src/com/intellij/ui/OptionalChooserComponent.form rename to platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form diff --git a/platform/util/src/com/intellij/ui/OptionalChooserComponent.java b/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.java similarity index 96% rename from platform/util/src/com/intellij/ui/OptionalChooserComponent.java rename to platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.java index 4c1788f2f2a2..3a5e81d6557b 100644 --- a/platform/util/src/com/intellij/ui/OptionalChooserComponent.java +++ b/platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.java @@ -26,7 +26,7 @@ import java.util.List; * @author oleg * This component represents a list of checkboxes. */ -public abstract class OptionalChooserComponent implements CheckBoxListListener { + public abstract class OptionalChooserComponent implements CheckBoxListListener { private JPanel myContentPane; private CheckBoxList myList; private DefaultListModel myListModel; diff --git a/platform/platform-api/src/com/intellij/ui/SearchTextField.java b/platform/platform-api/src/com/intellij/ui/SearchTextField.java index 5a5afdca53d6..6e628059ae50 100644 --- a/platform/platform-api/src/com/intellij/ui/SearchTextField.java +++ b/platform/platform-api/src/com/intellij/ui/SearchTextField.java @@ -28,6 +28,7 @@ import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; +import com.intellij.ui.components.JBList; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -306,7 +307,7 @@ public class SearchTextField extends JPanel { private void showPopup() { if (myPopup == null) { - final JList list = new JList(myModel); + final JList list = new JBList(myModel); if (myListener != null) { removeKeyListener(myListener); } diff --git a/platform/platform-api/src/com/intellij/ui/components/JBList.java b/platform/platform-api/src/com/intellij/ui/components/JBList.java index e1c858755898..20540127cdeb 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBList.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBList.java @@ -16,6 +16,8 @@ package com.intellij.ui.components; import com.intellij.ui.SimpleTextAttributes; +import com.intellij.ui.ToolTipHandler; +import com.intellij.ui.ToolTipHandlerFactory; import com.intellij.ui.TreeUIHelper; import com.intellij.util.ui.ComponentWithEmptyText; import com.intellij.util.ui.EmptyTextHelper; @@ -27,6 +29,7 @@ import java.util.Vector; public class JBList extends JList implements ComponentWithEmptyText{ private EmptyTextHelper myEmptyTextHelper; + private ToolTipHandler myToolTipHandler; public JBList() { init(); @@ -43,7 +46,7 @@ public class JBList extends JList implements ComponentWithEmptyText{ } public JBList(Collection items) { - super(new Vector(items)); + super(items.toArray()); init(); } @@ -55,7 +58,7 @@ public class JBList extends JList implements ComponentWithEmptyText{ } }; - TreeUIHelper.getInstance().installToolTipHandler(this); + myToolTipHandler = ToolTipHandlerFactory.getInstance().install(this); } public boolean isEmpty() { @@ -90,4 +93,8 @@ public class JBList extends JList implements ComponentWithEmptyText{ public void appendEmptyText(String text, SimpleTextAttributes attrs, ActionListener listener) { myEmptyTextHelper.appendEmptyText(text, attrs, listener); } + + public ToolTipHandler getToolTipHandler() { + return myToolTipHandler; + } } diff --git a/platform/platform-impl/src/com/intellij/application/options/SchemesToImportPopup.java b/platform/platform-impl/src/com/intellij/application/options/SchemesToImportPopup.java index afeabec3a8fa..0c27a3eb33d8 100644 --- a/platform/platform-impl/src/com/intellij/application/options/SchemesToImportPopup.java +++ b/platform/platform-impl/src/com/intellij/application/options/SchemesToImportPopup.java @@ -21,6 +21,7 @@ import com.intellij.openapi.options.SchemesManager; import com.intellij.openapi.options.SharedScheme; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.popup.PopupChooserBuilder; +import com.intellij.ui.components.JBList; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -44,7 +45,7 @@ public abstract class SchemesToImportPopup { private final JTextField myHexPrefix = new JTextField(20); private final JTextField myNumPostfixes = new JTextField(20); - private final JList[] myKeywordsLists = new JList[]{new JList(), new JList(), new JList(), new JList()}; + private final JList[] myKeywordsLists = new JList[]{new JBList(), new JBList(), new JBList(), new JBList()}; private final DefaultListModel[] myKeywordModels = new DefaultListModel[]{new DefaultListModel(), new DefaultListModel(), new DefaultListModel(), new DefaultListModel()}; private final JButton[] myAddKeywordButtons = new JButton[4]; private final JButton[] myRemoveKeywordButtons = new JButton[4]; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java index f2642492b77c..a38d00bdb137 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java @@ -28,6 +28,7 @@ import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.*; +import com.intellij.ui.components.JBList; import com.intellij.util.Alarm; import com.intellij.util.Consumer; import com.intellij.util.ui.UIUtil; @@ -440,7 +441,7 @@ public class SearchUtil { if (filter == null || filter.length() == 0) return null; final Map> hints = SearchableOptionsRegistrar.getInstance().findPossibleExtension(filter, project); final DefaultListModel model = new DefaultListModel(); - final JList list = new JList(model); + final JList list = new JBList(model); for (String groupName : hints.keySet()) { model.addElement(groupName); final Set descriptions = hints.get(groupName); 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 f6a344d34779..5fc3feff51ec 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java @@ -26,6 +26,7 @@ import com.intellij.openapi.ui.popup.*; import com.intellij.openapi.ui.popup.util.MinimizeButton; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.wm.impl.content.GraphicsConfig; +import com.intellij.ui.components.JBList; import com.intellij.ui.components.panels.Wrapper; import com.intellij.util.NotNullFunction; import com.intellij.util.Processor; @@ -323,7 +324,7 @@ public class NotificationsListPanel extends JPanel implements NotificationModelL } } - private static class ItemsList extends JList { + private static class ItemsList extends JBList { private ItemsList(final NotificationsListModel model) { super(model); setOpaque(false); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java index b87190034ab5..e3e07c664083 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java @@ -34,6 +34,7 @@ import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ListScrollingUtil; +import com.intellij.ui.components.JBList; import com.intellij.ui.popup.list.GroupedItemsListRenderer; import com.intellij.util.ui.update.LazyUiDisposable; import com.intellij.util.ui.update.MergingUpdateQueue; @@ -271,7 +272,7 @@ public abstract class FileTextFieldImpl implements FileLookup, Disposable, FileT private void showCompletionPopup(final CompletionResult result, int position, boolean isExplicit) { if (myList == null) { - myList = new JList(); + myList = new JBList(); myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myList.setCellRenderer(new GroupedItemsListRenderer(new ListItemDescriptor() { 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 e975fbcb4339..7bd281f53693 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 @@ -43,6 +43,7 @@ import com.intellij.openapi.util.IconLoader; 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.util.Alarm; import com.intellij.util.containers.HashMap; import com.intellij.util.ui.UIUtil; @@ -227,7 +228,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable { JLabel currentKeysLabel = new JLabel(KeyMapBundle.message("shortcuts.keymap.label")); panel.add(currentKeysLabel, new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST,GridBagConstraints.NONE, new Insets(0, 0, 0, 8), 0, 0)); - myShortcutsList = new JList(new DefaultListModel()); + myShortcutsList = new JBList(new DefaultListModel()); myShortcutsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myShortcutsList.setCellRenderer(new ShortcutListRenderer()); currentKeysLabel.setLabelFor(myShortcutsList); 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 fb3b8ea1f79a..93465b29aa45 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java @@ -37,6 +37,7 @@ import com.intellij.ui.DocumentAdapter; import com.intellij.ui.ListScrollingUtil; import com.intellij.ui.ReorderableListController; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.Nls; @@ -57,7 +58,7 @@ import java.util.List; */ public class QuickListsPanel extends JPanel implements SearchableConfigurable, MasterDetails { private final DefaultListModel myQuickListsModel = new DefaultListModel(); - private JList myQuickListsList = new JList(myQuickListsModel); + private JList myQuickListsList = new JBList(myQuickListsModel); private final JPanel myRightPanel = new JPanel(new BorderLayout()); private int myCurrentIndex = -1; private QuickListPanel myQuickListPanel = null; @@ -122,7 +123,7 @@ public class QuickListsPanel extends JPanel implements SearchableConfigurable, M private JPanel createQuickListsPanel() { JPanel panel = new JPanel(); panel.setLayout(new BorderLayout()); - myQuickListsList = new JList(myQuickListsModel); + myQuickListsList = new JBList(myQuickListsModel); myQuickListsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myQuickListsList.setCellRenderer(new MyQuickListCellRenderer()); myQuickListsList.addListSelectionListener(new ListSelectionListener() { diff --git a/platform/platform-impl/src/com/intellij/ui/ListToolTipHandler.java b/platform/platform-impl/src/com/intellij/ui/ListToolTipHandler.java index a4f58309f689..8d9b474f7cc7 100644 --- a/platform/platform-impl/src/com/intellij/ui/ListToolTipHandler.java +++ b/platform/platform-impl/src/com/intellij/ui/ListToolTipHandler.java @@ -27,7 +27,7 @@ import java.beans.PropertyChangeListener; public class ListToolTipHandler extends AbstractToolTipHandler{ public static void install(JList list) { - install(list); + installAndGet(list); } public static ListToolTipHandler installAndGet(JList list) { @@ -75,7 +75,7 @@ public class ListToolTipHandler extends AbstractToolTipHandler{ } }; - list.getModel().addListDataListener(modelListener); + if (list.getModel() != null) list.getModel().addListDataListener(modelListener); list.addPropertyChangeListener("model", new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { diff --git a/platform/platform-impl/src/com/intellij/ui/TableToolTipHandler.java b/platform/platform-impl/src/com/intellij/ui/TableToolTipHandler.java index 916bb0c42d19..46e3ecfd9745 100644 --- a/platform/platform-impl/src/com/intellij/ui/TableToolTipHandler.java +++ b/platform/platform-impl/src/com/intellij/ui/TableToolTipHandler.java @@ -78,7 +78,7 @@ public class TableToolTipHandler extends AbstractToolTipHandler { } }; - tree.getModel().addTreeModelListener(modelListener); + if (tree.getModel() != null) tree.getModel().addTreeModelListener(modelListener); tree.addPropertyChangeListener("model", new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { diff --git a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java index ba05ea8c7d66..2482485fc656 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java @@ -24,6 +24,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.statistics.StatisticsInfo; import com.intellij.psi.statistics.StatisticsManager; import com.intellij.ui.ListScrollingUtil; +import com.intellij.ui.components.JBList; import com.intellij.ui.popup.ClosableByLeftArrow; import com.intellij.ui.popup.PopupIcons; import com.intellij.ui.popup.WizardPopup; @@ -406,7 +407,7 @@ public class ListPopupImpl extends WizardPopup implements ListPopup { myIndexForShowingChild = aIndexForShowingChild; } - private class MyList extends JList implements DataProvider{ + private class MyList extends JBList implements DataProvider{ public MyList() { super(myListModel); } 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 1569d8f56e34..fa99872d247e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java @@ -22,6 +22,7 @@ import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Convertor; @@ -53,7 +54,7 @@ public class ColumnFilteringStrategy implements ChangeListFilteringStrategy { public ColumnFilteringStrategy(final ChangeListColumn column, final Class providerClass) { myModel = new MyListModel(); - myValueList = new JList(); + myValueList = new JBList(); myScrollPane = ScrollPaneFactory.createScrollPane(myValueList); myValueList.setModel(myModel); myValueList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/DebuggerFramesList.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/DebuggerFramesList.java index c1baa079ae29..1d07e372171d 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/DebuggerFramesList.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/DebuggerFramesList.java @@ -17,6 +17,7 @@ package com.intellij.xdebugger.impl.frame; import com.intellij.ide.OccurenceNavigator; import com.intellij.ui.ListToolTipHandler; +import com.intellij.ui.components.JBList; import com.intellij.xdebugger.XDebuggerBundle; import javax.swing.*; @@ -26,12 +27,11 @@ import javax.swing.event.ListSelectionListener; /** * @author nik */ -public abstract class DebuggerFramesList extends JList implements OccurenceNavigator { +public abstract class DebuggerFramesList extends JBList implements OccurenceNavigator { public DebuggerFramesList() { super(new DefaultListModel()); getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); setCellRenderer(createListRenderer()); - ListToolTipHandler.install(this); getSelectionModel().addListSelectionListener(new ListSelectionListener() { public void valueChanged(final ListSelectionEvent e) { if (!e.getValueIsAdjusting()) { diff --git a/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataNavigationHandler.java b/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataNavigationHandler.java index 775105de35b1..85675691570f 100644 --- a/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataNavigationHandler.java +++ b/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataNavigationHandler.java @@ -31,6 +31,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiMethod; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.awt.RelativePoint; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.Nullable; @@ -99,7 +100,7 @@ public class TestDataNavigationHandler implements GutterIconNavigationHandler data, String listDescription) { setTitle(title); - final JList list = new JList(); + final JList list = new JBList(); myLists.add(list); list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.addListSelectionListener(new ListSelectionListener() { diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java index 58e83d013a23..1c79d719e19a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java @@ -17,6 +17,7 @@ package com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch.ui; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ui.popup.PopupChooserBuilder; +import com.intellij.ui.components.JBList; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -44,7 +45,7 @@ public class TagsPanel extends JPanel implements TableCellRenderer{ }; private Collection myTags; - private final JList myList = new JList(); + private final JList myList = new JBList(); @NonNls private static final String MORE_LABEL_TEXT = "(...)"; private final String myPopupTitle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/ChooseCheckoutMode.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/ChooseCheckoutMode.java index 3559ae2ac944..914b432bdc45 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/ChooseCheckoutMode.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/ChooseCheckoutMode.java @@ -26,6 +26,7 @@ import com.intellij.openapi.vcs.checkout.CheckoutStrategy; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; +import com.intellij.ui.components.JBList; import com.intellij.util.Icons; import com.intellij.util.containers.HashSet; import com.intellij.util.ui.UIUtil; @@ -45,7 +46,7 @@ public class ChooseCheckoutMode extends WizardStep { private File mySelectedLocation; private final Collection myCvsPaths = new ArrayList(); private final DefaultListModel myCheckoutModeModel = new DefaultListModel(); - private final JList myCheckoutModeList = new JList(myCheckoutModeModel); + private final JList myCheckoutModeList = new JBList(myCheckoutModeModel); private final JCheckBox myMakeNewFielsReadOnly = new JCheckBox(com.intellij.CvsBundle.message("checkbox.make.new.files.read.only")); private final JCheckBox myPruneEmptyDirectories = new JCheckBox(com.intellij.CvsBundle.message("checkbox.prune.empty.directories")); private final ChangeKeywordSubstitutionPanel myChangeKeywordSubstitutionPanel; diff --git a/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java b/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java index 27129660b9ae..b1c3986e5d54 100644 --- a/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java +++ b/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java @@ -37,6 +37,7 @@ import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -89,7 +90,7 @@ public class CreateHtmlDescriptionFix implements LocalQuickFix, Iconable { for (VirtualFile file : roots) { options.add(file.getPresentableUrl() + File.separator + DESCRIPTIONS_FOLDER + File.separator + myFilename); } - final JList files = new JList(ArrayUtil.toStringArray(options)); + final JList files = new JBList(ArrayUtil.toStringArray(options)); final PopupChooserBuilder builder = JBPopupFactory.getInstance().createListPopupBuilder(files); final JBPopup popup = builder.setTitle(DevKitBundle.message("select.target.location.of.description", myFilename)).setItemChoosenCallback(new Runnable() { public void run() { diff --git a/plugins/devkit/src/util/ChooseModulesDialog.java b/plugins/devkit/src/util/ChooseModulesDialog.java index da2ace2b29f0..1742a1b288fb 100644 --- a/plugins/devkit/src/util/ChooseModulesDialog.java +++ b/plugins/devkit/src/util/ChooseModulesDialog.java @@ -25,6 +25,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.xml.XmlFile; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleTextAttributes; +import com.intellij.ui.components.JBList; import org.jetbrains.annotations.NonNls; import org.jetbrains.idea.devkit.DevKitBundle; import org.jetbrains.idea.devkit.module.PluginModuleType; @@ -170,7 +171,7 @@ public class ChooseModulesDialog extends DialogWrapper { public MyTableCellRenderer(Project project) { myProject = project; - myList = new JList(); + myList = new JBList(); myCellRenderer = new ColoredListCellRenderer() { protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) { final Module module = ((Module)value); diff --git a/plugins/git4idea/src/git4idea/history/browser/GitLogTree.java b/plugins/git4idea/src/git4idea/history/browser/GitLogTree.java index 3a03b2e3af81..ef27ac23bc07 100644 --- a/plugins/git4idea/src/git4idea/history/browser/GitLogTree.java +++ b/plugins/git4idea/src/git4idea/history/browser/GitLogTree.java @@ -45,6 +45,7 @@ import com.intellij.ui.ColoredListCellRenderer; 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.treeStructure.Tree; import com.intellij.util.*; import com.intellij.util.containers.Convertor; @@ -117,7 +118,7 @@ public class GitLogTree implements GitTreeViewI { myFiltersSplitter.setDividerWidth(3); myInitWaiters = new LinkedList(); - myCommitsList = new JList(); + myCommitsList = new JBList(); myController.init(); } diff --git a/plugins/git4idea/src/git4idea/history/browser/SelectGitBranchesPopup.java b/plugins/git4idea/src/git4idea/history/browser/SelectGitBranchesPopup.java index d6562a316306..c324cac7dd80 100644 --- a/plugins/git4idea/src/git4idea/history/browser/SelectGitBranchesPopup.java +++ b/plugins/git4idea/src/git4idea/history/browser/SelectGitBranchesPopup.java @@ -19,6 +19,7 @@ import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleTextAttributes; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import com.intellij.util.Consumer; @@ -33,7 +34,7 @@ public class SelectGitBranchesPopup { final List branchesAndTags, boolean tags, DataContext dc) { - final JList list = new JList(); + final JList list = new JBList(); list.setCellRenderer(new BranchListCellRenderer(tags)); list.setListData(ArrayUtil.toObjectArray(branchesAndTags)); JBPopupFactory.getInstance().createListPopupBuilder(list) diff --git a/plugins/git4idea/src/git4idea/history/browser/UsersPopup.java b/plugins/git4idea/src/git4idea/history/browser/UsersPopup.java index b3117dba3195..42f64dc8c846 100644 --- a/plugins/git4idea/src/git4idea/history/browser/UsersPopup.java +++ b/plugins/git4idea/src/git4idea/history/browser/UsersPopup.java @@ -18,6 +18,7 @@ package git4idea.history.browser; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.ui.ListSpeedSearch; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import com.intellij.util.Consumer; @@ -30,7 +31,7 @@ public class UsersPopup { public static void showUsersPopup(final List knownUsers, final Consumer continuation, DataContext dc) { // todo pattern to come - final JList list = new JList(); + final JList list = new JBList(); list.setListData(ArrayUtil.toObjectArray(knownUsers)); new ListSpeedSearch(list); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java index 969502dffb46..eebd84f6ad78 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java @@ -32,6 +32,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PsiShortNamesCache; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.psi.util.proximity.PsiProximityComparator; +import com.intellij.ui.components.JBList; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -174,7 +175,7 @@ public class GroovyStaticImportMethodFix implements IntentionAction { } private void chooseAndImport(Editor editor) { - final JList list = new JList(getCandidates().toArray(new PsiMethod[getCandidates().size()])); + final JList list = new JBList(getCandidates().toArray(new PsiMethod[getCandidates().size()])); list.setCellRenderer(new MethodCellRenderer(true)); new PopupChooserBuilder(list). setTitle(QuickFixBundle.message("static.import.method.choose.method.to.import")). 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 7fc086466679..656d33b94215 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java @@ -24,6 +24,7 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.NonFocusableCheckBox; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.doc.actions.GroovyDocAddPackageAction; @@ -64,7 +65,7 @@ public final class GroovyDocGenerationPanel extends JPanel { myDataModel = new DefaultListModel(); - myPackagesList = new JList(myDataModel); + myPackagesList = new JBList(myDataModel); myPackagesList.setMinimumSize(new Dimension(100, 150)); JScrollPane packagesScrollPane = ScrollPaneFactory.createScrollPane(myPackagesList); diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRunConflictResolverDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRunConflictResolverDialog.java index ac6df8fc6e09..d3748275ed22 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRunConflictResolverDialog.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRunConflictResolverDialog.java @@ -15,6 +15,7 @@ package org.zmlx.hg4idea.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.components.JBList; import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; import com.intellij.uiDesigner.core.Spacer; @@ -107,7 +108,7 @@ public class HgRunConflictResolverDialog extends DialogWrapper { panel1.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1)); mainPanel.add(panel1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); panel1.setBorder(BorderFactory.createTitledBorder("Files with conflicts:")); - conflictsList = new JList(); + conflictsList = new JBList(); panel1.add(conflictsList, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_WANT_GROW, null, new Dimension(150, 150), null, 0, false)); final Spacer spacer1 = new Spacer(); mainPanel.add(spacer1, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false)); diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/MethodListDlg.java b/plugins/junit/src/com/intellij/execution/junit2/configuration/MethodListDlg.java index 5a3c21fed927..cd84f5a93339 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/configuration/MethodListDlg.java +++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/MethodListDlg.java @@ -25,6 +25,7 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.ui.*; +import com.intellij.ui.components.JBList; import javax.swing.*; import java.awt.*; @@ -42,7 +43,7 @@ public class MethodListDlg extends DialogWrapper { } }; private final SortedListModel myListModel = new SortedListModel(METHOD_NAME_COMPARATOR); - private final JList myList = new JList(myListModel); + private final JList myList = new JBList(myListModel); private final JPanel myWholePanel = new JPanel(new BorderLayout()); public MethodListDlg(final PsiClass psiClass, final Condition filter, final JComponent parent) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java index e8bf886fa878..b1b790b5896a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java @@ -24,6 +24,7 @@ import com.intellij.openapi.ui.popup.util.BaseListPopupStep; import com.intellij.openapi.util.Ref; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.components.JBList; import com.intellij.util.Consumer; import com.intellij.util.concurrency.Semaphore; import com.intellij.util.ui.UIUtil; @@ -232,7 +233,7 @@ public class SelectBranchPopup { System.arraycopy(branches.toArray(), 0, items, 0, branches.size()); items[items.length - 1] = REFRESH_MESSAGE; - final JList branchList = new JList(items); + final JList branchList = new JBList(items); branchList.setCellRenderer(new BranchRenderer()); final JBPopup popup = JBPopupFactory.getInstance().createListPopupBuilder(branchList) .setTitle(SVNPathUtil.tail(selectedValue)) diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/GroupList.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/GroupList.java index eec60740df42..1c12f9eb145f 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/GroupList.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/GroupList.java @@ -20,6 +20,7 @@ import com.intellij.psi.PsiClass; import com.intellij.ui.ListScrollingUtil; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SortedListModel; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import com.theoryinpractice.testng.util.TestNGUtil; @@ -42,7 +43,7 @@ public class GroupList extends JPanel return s1.compareTo(s2); } }); - list = new JList(model); + list = new JBList(model); Set groups = TestNGUtil.getAnnotationValues("groups", classes); String[] array = ArrayUtil.toStringArray(groups); Arrays.sort(array); diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/MethodList.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/MethodList.java index 02227a4711c7..df6e8d066e84 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/MethodList.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/MethodList.java @@ -21,6 +21,7 @@ import com.intellij.openapi.util.Condition; import com.intellij.psi.*; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.ui.*; +import com.intellij.ui.components.JBList; import com.theoryinpractice.testng.util.TestNGUtil; import java.awt.BorderLayout; @@ -53,7 +54,7 @@ public class MethodList extends JPanel { super(new BorderLayout()); model = new SortedListModel(comparator); - list = new JList(model); + list = new JBList(model); this.psiClass = psiClass; evaluate(psiClass.getAllMethods(), new TestMethodFilter()); add(ScrollPaneFactory.createScrollPane(list)); 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 531b9555c7db..b56d84577ffb 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ColorEditor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ColorEditor.java @@ -18,6 +18,7 @@ package com.intellij.uiDesigner.propertyInspector.editors; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TextFieldWithBrowseButton; +import com.intellij.ui.components.JBList; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.lw.ColorDescriptor; import com.intellij.uiDesigner.propertyInspector.PropertyEditor; @@ -227,7 +228,7 @@ public class ColorEditor extends PropertyEditor { protected void buildChooser() { setLayout(new BorderLayout()); - myDescriptorList = new JList(myColorDescriptors); + myDescriptorList = new JBList(myColorDescriptors); myDescriptorList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myDescriptorList.setVisibleRowCount(15); myDescriptorList.setCellRenderer(new ColorRenderer()); diff --git a/plugins/ui-designer/testData/ChainedConstructorTest.java b/plugins/ui-designer/testData/ChainedConstructorTest.java index 57960f4192a7..f29d9b7bc44b 100644 --- a/plugins/ui-designer/testData/ChainedConstructorTest.java +++ b/plugins/ui-designer/testData/ChainedConstructorTest.java @@ -26,7 +26,7 @@ public class ChainedConstructorTest { } public ChainedConstructorTest(String[] names, boolean mode) { - myList = new JList(); + myList = new JBList(); myScrollPane.setViewportView(myList); } } \ 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 6b279ba93571..7b1b36f8953a 100644 --- a/xml/impl/src/com/intellij/application/options/TagListDialog.java +++ b/xml/impl/src/com/intellij/application/options/TagListDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.application.ApplicationBundle; 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.util.Icons; import javax.swing.*; @@ -28,7 +29,7 @@ import java.util.ArrayList; public class TagListDialog extends DialogWrapper{ private final JPanel myPanel = new JPanel(new BorderLayout()); - private final JList myList = new JList(new DefaultListModel()); + private final JList myList = new JBList(new DefaultListModel()); private ArrayList myData; public TagListDialog(String title) { diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java index 91e3b8d11f19..e711a255308a 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java @@ -46,6 +46,7 @@ import com.intellij.psi.xml.XmlDocument; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.psi.xml.XmlToken; +import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.xml.XmlElementDescriptor; @@ -244,7 +245,7 @@ public class CreateNSDeclarationIntentionFix implements HintAction, LocalQuickFi final Editor editor) throws IncorrectOperationException { if (namespacesToChooseFrom.length > 1 && !ApplicationManager.getApplication().isUnitTestMode()) { - final JList list = new JList(namespacesToChooseFrom); + final JList list = new JBList(namespacesToChooseFrom); list.setCellRenderer(XmlNSRenderer.INSTANCE); Runnable runnable = new Runnable() { public void run() { diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/ImportNSAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/ImportNSAction.java index e13b7bdda9f7..e8b01c702e0f 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/ImportNSAction.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/ImportNSAction.java @@ -23,6 +23,7 @@ import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.xml.XmlFile; +import com.intellij.ui.components.JBList; import com.intellij.util.IncorrectOperationException; import com.intellij.xml.XmlExtension; import org.jetbrains.annotations.NotNull; @@ -55,7 +56,7 @@ public class ImportNSAction implements QuestionAction { public boolean execute() { final Object[] objects = myNamespaces.toArray(); Arrays.sort(objects); - final JList list = new JList(objects); + final JList list = new JBList(objects); list.setCellRenderer(XmlNSRenderer.INSTANCE); list.setSelectedIndex(0); final Runnable runnable = new Runnable() {