diff --git a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java index aba3f2bc97da..369c43093bc3 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java @@ -74,7 +74,7 @@ public class JavaCompilersTab implements SearchableConfigurable, Configurable.No myContentPanel.add(configurable.createComponent(), compiler.getId()); } myCompiler.setModel(new DefaultComboBoxModel(new Vector(compilers))); - myCompiler.setRenderer(new ListCellRendererWrapper(myCompiler.getRenderer()) { + myCompiler.setRenderer(new ListCellRendererWrapper() { @Override public void customize(final JList list, final BackendCompiler value, final int index, final boolean selected, final boolean hasFocus) { setText(value != null ? value.getPresentableName() : ""); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java index 8db0cd13169f..a0bd4cc96dcd 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java @@ -160,7 +160,7 @@ public class JarArtifactFromModulesDialog extends DialogWrapper { private static class ModuleListRenderer extends ListCellRendererWrapper { public ModuleListRenderer(JComboBox comboBox) { - super(comboBox); + super(); } @Override diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerComboBoxRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerComboBoxRenderer.java index a696a837ab4f..015884f253f8 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerComboBoxRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerComboBoxRenderer.java @@ -24,7 +24,7 @@ import javax.swing.*; public class DebuggerComboBoxRenderer extends ListCellRendererWrapper { public DebuggerComboBoxRenderer(final ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); } @Override diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java index f63e679684ff..28fccad3e6fc 100644 --- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java +++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java @@ -67,7 +67,7 @@ public class ConfigurationModuleSelector { } }; myModulesList.setModel(myModules); - myModulesList.setRenderer(new ListCellRendererWrapper(myModulesList.getRenderer()) { + myModulesList.setRenderer(new ListCellRendererWrapper() { @Override public void customize(final JList list, final Object value, final int index, final boolean selected, final boolean hasFocus) { if (value instanceof Module) { diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java index 764a0f7d433e..5e29ad55602a 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java @@ -76,7 +76,7 @@ public class DownloadingOptionsDialog extends DialogWrapper { for (FrameworkLibraryVersion version : versions) { myVersionComboBox.addItem(version); } - myVersionComboBox.setRenderer(new ListCellRendererWrapper(myVersionComboBox) { + myVersionComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, FrameworkLibraryVersion value, int index, boolean selected, boolean hasFocus) { setText(value.getName() + value.getVersionString()); diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java index 320aa81ba078..c6da3f5728e2 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -190,7 +190,7 @@ public class LibraryOptionsPanel implements Disposable { updateState(); } }); - myExistingLibraryComboBox.setRenderer(new HtmlListCellRenderer(myExistingLibraryComboBox.getRenderer()) { + myExistingLibraryComboBox.setRenderer(new HtmlListCellRenderer() { @Override protected void doCustomize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value == null) { diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/DetectedRootsChooser.java b/java/idea-ui/src/com/intellij/ide/util/importProject/DetectedRootsChooser.java index 43e2b38a5490..d21c884ef4ff 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/DetectedRootsChooser.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/DetectedRootsChooser.java @@ -116,7 +116,7 @@ public class DetectedRootsChooser { @Override public TableCellEditor getEditor(DetectedRootData o) { final ComboBox comboBox = new ComboBox(new CollectionComboBoxModel(Arrays.asList(o.getAllRoots()), o.getSelectedRoot())); - comboBox.setRenderer(new ListCellRendererWrapper(comboBox) { + comboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, DetectedProjectRoot value, int index, boolean selected, boolean hasFocus) { setText(value.getRootTypeName()); diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkListRenderer.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkListRenderer.java index 4eb42200851d..3166741b8921 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkListRenderer.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkListRenderer.java @@ -28,7 +28,7 @@ import javax.swing.*; */ public class ProjectJdkListRenderer extends HtmlListCellRenderer { public ProjectJdkListRenderer(final ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); } @Override diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelCombo.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelCombo.java index 78a6ecb3cce9..09a5384796c8 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelCombo.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelCombo.java @@ -34,7 +34,7 @@ public class LanguageLevelCombo extends ComboBox { for (LanguageLevel level : LanguageLevel.values()) { addItem(level); } - setRenderer(new ListCellRendererWrapper(getRenderer()) { + setRenderer(new ListCellRendererWrapper() { @Override public void customize(final JList list, final Object value, final int index, final boolean selected, final boolean hasFocus) { if (value instanceof LanguageLevel) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactTypeCellRenderer.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactTypeCellRenderer.java index 134b848aab8a..7817a387dbf6 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactTypeCellRenderer.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactTypeCellRenderer.java @@ -25,7 +25,7 @@ import javax.swing.*; */ public class ArtifactTypeCellRenderer extends ListCellRendererWrapper { public ArtifactTypeCellRenderer(final ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); } @Override diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryDialog.java index 51dd5c610cf1..92a3c065cd75 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryDialog.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryDialog.java @@ -50,7 +50,7 @@ public class CreateNewLibraryDialog extends LibraryEditorDialogBase { } myLibraryLevelCombobox = new ComboBox(model); myLibraryLevelCombobox.setSelectedIndex(selectedTable); - myLibraryLevelCombobox.setRenderer(new ListCellRendererWrapper(myLibraryLevelCombobox.getRenderer()) { + myLibraryLevelCombobox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof LibraryTable) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryNameAndLevelPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryNameAndLevelPanel.java index fe24a3829339..c55904c77519 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryNameAndLevelPanel.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryNameAndLevelPanel.java @@ -50,7 +50,7 @@ public class LibraryNameAndLevelPanel { levels.put(LibrariesContainer.LibraryLevel.GLOBAL, ProjectBundle.message("combobox.item.global.library")); levels.put(LibrariesContainer.LibraryLevel.PROJECT, ProjectBundle.message("combobox.item.project.library")); levels.put(LibrariesContainer.LibraryLevel.MODULE, ProjectBundle.message("combobox.item.module.library")); - myLevelComboBox.setRenderer(new ListCellRendererWrapper(myLevelComboBox.getRenderer()) { + myLevelComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof LibrariesContainer.LibraryLevel) { diff --git a/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java b/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java index 80addc1db90a..d022e07cea72 100644 --- a/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java @@ -176,7 +176,7 @@ public class Java15APIUsageInspection extends BaseJavaLocalInspectionTool { cModel.addElement(level); } llCombo.setSelectedItem(myEffectiveLanguageLevel != null ? myEffectiveLanguageLevel : LanguageLevel.JDK_1_3); - llCombo.setRenderer(new ListCellRendererWrapper(llCombo.getRenderer()) { + llCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof LanguageLevel) { diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldPopupPanel.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldPopupPanel.java index 3d436225398c..5f3cfe92e81a 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldPopupPanel.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldPopupPanel.java @@ -146,7 +146,7 @@ public class IntroduceFieldPopupPanel extends IntroduceFieldCentralPanel { JComboBox initializersCombo = new JComboBox(myInitialisersPlaceModel); KeyboardComboSwitcher.setupActions(initializersCombo, myParentClass.getProject()); initLabel.setLabelFor(initializersCombo); - initializersCombo.setRenderer(new ListCellRendererWrapper(initializersCombo) { + initializersCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, BaseExpressionToFieldHandler.InitializationPlace value, diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterUI.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterUI.java index 5c04275eb1b8..1dd601d63801 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterUI.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterUI.java @@ -73,7 +73,7 @@ public abstract class InplaceIntroduceParameterUI extends IntroduceParameterSett myReplaceFieldsCb = new JComboBox(new Integer[]{IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE}); - myReplaceFieldsCb.setRenderer(new ListCellRendererWrapper(myReplaceFieldsCb) { + myReplaceFieldsCb.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Integer value, int index, boolean selected, boolean hasFocus) { switch (value) { diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/ReassignVariableUtil.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/ReassignVariableUtil.java index 96192b14e56b..28da2a95e3b6 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/ReassignVariableUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/ReassignVariableUtil.java @@ -67,7 +67,7 @@ public class ReassignVariableUtil { model.addElement(proc.getResult(i)); } final JList list = new JBList(model); - list.setCellRenderer(new ListCellRendererWrapper(new DefaultListCellRenderer()) { + list.setCellRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof PsiVariable) { diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java index 056555646e0a..b836b0ea1f81 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/DestinationFolderComboBox.java @@ -95,7 +95,7 @@ public abstract class DestinationFolderComboBox extends ComboboxWithBrowseButton } }; final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex(); - getComboBox().setRenderer(new ListCellRendererWrapper(getComboBox().getRenderer()) { + getComboBox().setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, DirectoryChooser.ItemWrapper itemWrapper, diff --git a/java/java-impl/src/com/intellij/refactoring/ui/ClassCellRenderer.java b/java/java-impl/src/com/intellij/refactoring/ui/ClassCellRenderer.java index bfe74e86f436..c3ffd03a6a2d 100644 --- a/java/java-impl/src/com/intellij/refactoring/ui/ClassCellRenderer.java +++ b/java/java-impl/src/com/intellij/refactoring/ui/ClassCellRenderer.java @@ -33,7 +33,7 @@ public class ClassCellRenderer extends ListCellRendererWrapper { private final boolean myShowReadOnly; public ClassCellRenderer(ListCellRenderer original) { - super(original); + super(); myShowReadOnly = true; } diff --git a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java index d2985b6a6efb..44c3def6e0c3 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java +++ b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java @@ -127,7 +127,7 @@ public abstract class ParameterTablePanel extends JPanel { myTypeRendererCombo = new JComboBox(getVariableData()); myTypeRendererCombo.setOpaque(true); myTypeRendererCombo.setBorder(null); - myTypeRendererCombo.setRenderer(new ListCellRendererWrapper(myTypeRendererCombo.getRenderer()) { + myTypeRendererCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, VariableData value, int index, boolean selected, boolean hasFocus) { if (value != null) { diff --git a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueDialog.java b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueDialog.java index 19a3255e0d96..ac9b65950590 100644 --- a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueDialog.java @@ -199,7 +199,7 @@ class WrapReturnValueDialog extends RefactoringDialog { final DefaultComboBoxModel model = new DefaultComboBoxModel(); myFieldsCombo.setModel(model); - myFieldsCombo.setRenderer(new ListCellRendererWrapper(myFieldsCombo.getRenderer()) { + myFieldsCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof PsiField) { diff --git a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java index f1c634f31ffb..1572e71f5180 100644 --- a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java +++ b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java @@ -233,7 +233,7 @@ public class UnscrambleDialog extends DialogWrapper { for (final UnscrambleSupport unscrambleSupport : unscrambleComponents) { myUnscrambleChooser.addItem(unscrambleSupport); } - myUnscrambleChooser.setRenderer(new ListCellRendererWrapper(myUnscrambleChooser.getRenderer()) { + myUnscrambleChooser.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, UnscrambleSupport unscrambleSupport, int index, boolean selected, boolean hasFocus) { setText(unscrambleSupport == null ? IdeBundle.message("unscramble.no.unscrambler.item") : unscrambleSupport.getPresentableName()); diff --git a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java index 4a1cd864ed1b..ff38f83b4972 100644 --- a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java +++ b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java @@ -66,7 +66,7 @@ public class FrameworkSupportConfigurableBase extends FrameworkSupportConfigurab } } myVersionComboBox.setPrototypeDisplayValue(maxValue + "_"); - myVersionComboBox.setRenderer(new ListCellRendererWrapper(myVersionComboBox.getRenderer()) { + myVersionComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof FrameworkVersion) { diff --git a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java index 051471196065..d9ab146ee5bc 100644 --- a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java +++ b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java @@ -82,7 +82,7 @@ public class InitialConfigurationDialog extends DialogWrapper { } myKeymapComboBox.setModel(new DefaultComboBoxModel(keymaps.toArray(new Keymap[keymaps.size()]))); - myKeymapComboBox.setRenderer(new ListCellRendererWrapper(myKeymapComboBox.getRenderer()) { + myKeymapComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(final JList list, final Object value, final int index, final boolean selected, final boolean cellHasFocus) { Keymap keymap = (Keymap)value; @@ -104,7 +104,7 @@ public class InitialConfigurationDialog extends DialogWrapper { final EditorColorsScheme[] colorSchemes = EditorColorsManager.getInstance().getAllSchemes(); myColorSchemeComboBox.setModel(new DefaultComboBoxModel(colorSchemes)); - myColorSchemeComboBox.setRenderer(new ListCellRendererWrapper(myColorSchemeComboBox.getRenderer()) { + myColorSchemeComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean cellHasFocus) { if (value != null) { diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java index d04b2a14ef38..852b8b3cdb77 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java @@ -60,7 +60,7 @@ public class CodeStyleSchemesPanel{ } } }); - myCombo.setRenderer(new ListCellRendererWrapper(myCombo.getRenderer()) { + myCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(final JList list, final Object value, final int index, final boolean selected, final boolean hasFocus) { Font font = myDefaultComboFont; diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontDescriptionPanel.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontDescriptionPanel.java index df18454c2511..1dd13c78de77 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontDescriptionPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontDescriptionPanel.java @@ -69,7 +69,7 @@ public class ColorAndFontDescriptionPanel extends JPanel { add(settingsPanel, BorderLayout.CENTER); setBorder(BorderFactory.createEmptyBorder(4, 0, 4, 4)); - myEffectsCombo.setRenderer(new ListCellRendererWrapper(myEffectsCombo.getRenderer()) { + myEffectsCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, String value, int index, boolean selected, boolean hasFocus) { setText(value != null ? value : "Invalid"); diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.java index 91dbab134a2b..cbb57dbb1081 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.java @@ -219,7 +219,7 @@ public class EditorTabsConfigurable implements EditorOptionsProvider { private static final class MyTabsPlacementComboBoxRenderer extends ListCellRendererWrapper { public MyTabsPlacementComboBoxRenderer(final ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); } @Override diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java index 25709d407066..ac32c3a30f71 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java @@ -248,7 +248,7 @@ public class ImplementationViewComponent extends JPanel { } private void updateRenderer(final Project project) { - myFileChooser.setRenderer(new ListCellRendererWrapper(myFileChooser.getRenderer()) { + myFileChooser.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, FileDescriptor value, int index, boolean selected, boolean hasFocus) { final PsiFile file = value.myFile; diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java index 6fddee9ae2e2..cfc1cacc5a15 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java @@ -91,7 +91,7 @@ public class CodeInspectionAction extends BaseAnalysisAction { final AdditionalPanel panel = new AdditionalPanel(); final InspectionManagerEx manager = (InspectionManagerEx)InspectionManager.getInstance(project); final JComboBox profiles = panel.myBrowseProfilesCombo.getComboBox(); - profiles.setRenderer(new ListCellRendererWrapper(profiles.getRenderer()) { + profiles.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof Profile) { diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java b/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java index 6d83ba4f2e32..8b8eb3362a29 100644 --- a/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java +++ b/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java @@ -294,7 +294,7 @@ public class ExecutionHelper { else if (consoles.size() > 1) { final JList list = new JBList(consoles); final Icon icon = DefaultRunExecutor.getRunExecutorInstance().getIcon(); - list.setCellRenderer(new ListCellRendererWrapper(list.getCellRenderer()) { + list.setCellRenderer(new ListCellRendererWrapper() { @Override public void customize(final JList list, final RunContentDescriptor value, diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/DetectedFrameworksComponent.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/DetectedFrameworksComponent.java index f60f0deffcbd..5979940f595d 100644 --- a/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/DetectedFrameworksComponent.java +++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/DetectedFrameworksComponent.java @@ -111,7 +111,7 @@ public class DetectedFrameworksComponent { private class GroupByListCellRenderer extends ListCellRendererWrapper { public GroupByListCellRenderer() { - super(DetectedFrameworksComponent.this.myGroupByComboBox); + super(); } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/actions/TemplateKindCombo.java b/platform/lang-impl/src/com/intellij/ide/actions/TemplateKindCombo.java index e7a721c97ac6..3c837386337f 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/TemplateKindCombo.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/TemplateKindCombo.java @@ -35,7 +35,7 @@ public class TemplateKindCombo extends ComboboxWithBrowseButton { private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.TemplateKindCombo"); public TemplateKindCombo() { - getComboBox().setRenderer(new ListCellRendererWrapper(getComboBox().getRenderer()) { + getComboBox().setRenderer(new ListCellRendererWrapper() { @Override public void customize(final JList list, final Object value, final int index, final boolean selected, final boolean cellHasFocus) { if (value instanceof Trinity) { diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/SelectTemplateDialog.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/SelectTemplateDialog.java index a4568696037b..12a2b8b34631 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/SelectTemplateDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/SelectTemplateDialog.java @@ -81,7 +81,7 @@ public class SelectTemplateDialog extends DialogWrapper{ } if(myCbxTemplates == null){ myCbxTemplates = new JComboBox(model); - myCbxTemplates.setRenderer(new ListCellRendererWrapper(myCbxTemplates.getRenderer()) { + myCbxTemplates.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, FileTemplate fileTemplate, int index, boolean selected, boolean hasFocus) { if (fileTemplate != null) { diff --git a/platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosPanel.java b/platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosPanel.java index 14bb7d60290a..16e21740d9e9 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosPanel.java @@ -67,7 +67,7 @@ public class ScopeBasedTodosPanel extends TodoPanel { myValidationManager = DependencyValidationManager.getInstance(project); myValidationManager.addScopeListener(myScopeListener); - myScopes.setRenderer(new ListCellRendererWrapper(myScopes){ + myScopes.setRenderer(new ListCellRendererWrapper(){ @Override public void customize(JList list, NamedScope value, int index, boolean selected, boolean hasFocus) { setText(value.getName()); diff --git a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebModuleGenerationStep.java b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebModuleGenerationStep.java index 89ae729c865c..c71ff0d2db0a 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebModuleGenerationStep.java +++ b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebModuleGenerationStep.java @@ -89,7 +89,7 @@ public class WebModuleGenerationStep extends ModuleWizardStep { generatorList.setModel(listModel); generatorList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); generatorList.getExpandableItemsHandler().setEnabled(false); - generatorList.setCellRenderer(new ListCellRendererWrapper(generatorList.getCellRenderer()) { + generatorList.setCellRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, DirectoryProjectGenerator value, diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java index c7853d3f2cb0..8906f3199a8b 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java @@ -100,7 +100,7 @@ public class PackageSetChooserCombo extends ComponentWithBrowseButton(((JComboBox)component).getRenderer()) { + ((JComboBox)component).setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, NamedScope value, int index, boolean selected, boolean hasFocus) { setText(value == null ? "" : value.getName()); diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java index 5036959a0765..5ce294015ffa 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserCombo.java @@ -483,7 +483,7 @@ public class ScopeChooserCombo extends ComboboxWithBrowseButton implements Dispo private static class ScopeDescriptionWithDelimiterRenderer extends ListCellRendererWrapper { public ScopeDescriptionWithDelimiterRenderer(final ListCellRenderer original) { - super(original); + super(); } @Override 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 33176589a92a..ac288646e2e5 100644 --- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java +++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java @@ -347,7 +347,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disp } } myFileTypeComboBox.setModel(new CollectionComboBoxModel(ContainerUtil.newArrayList(mySourceWrappers), lastUsed)); - myFileTypeComboBox.setRenderer(new ListCellRendererWrapper(myFileTypeComboBox.getRenderer()) { + myFileTypeComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, SourceWrapper value, int index, boolean selected, boolean hasFocus) { if (value != null) { @@ -381,14 +381,14 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disp myFileTypeComboBox.setSelectedIndex(0); } - myDialectComboBox.setRenderer(new ListCellRendererWrapper(myDialectComboBox.getRenderer()) { + myDialectComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(final JList list, final Language value, final int index, final boolean selected, final boolean hasFocus) { setText(value != null ? value.getDisplayName() : ""); } }); myDialectComboBox.addFocusListener(new AutoExpandFocusListener(myDialectComboBox)); - myExtensionComboBox.setRenderer(new ListCellRendererWrapper(myExtensionComboBox.getRenderer()) { + myExtensionComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, String value, int index, boolean selected, boolean hasFocus) { if (value != null) setText("." + value); diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePatternDialog.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePatternDialog.java index 07b32ea69808..86e8100ade58 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePatternDialog.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePatternDialog.java @@ -51,7 +51,7 @@ public class FileTypePatternDialog { for (Language language : languages) { model.addElement(language); } - myLanguageCombo.setRenderer(new ListCellRendererWrapper(myLanguageCombo.getRenderer()) { + myLanguageCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { setText(value == null ? "" : ((Language) value).getDisplayName()); diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkListCellRenderer.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkListCellRenderer.java index 8ec4ded3a5b5..f48df21af652 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkListCellRenderer.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkListCellRenderer.java @@ -32,16 +32,16 @@ public class SdkListCellRenderer extends HtmlListCellRenderer { private boolean myShowHomePath; public SdkListCellRenderer(final ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); } public SdkListCellRenderer(final String nullText, final ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); myNullText = nullText; } public SdkListCellRenderer(final String nullText, final boolean showHomePath, final ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); myNullText = nullText; myShowHomePath = showHomePath; } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java index 632dc369bcc5..ef7ebb67b5eb 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java @@ -52,7 +52,7 @@ public class ModulesCombobox extends ComboBox { return super.getElementText(element); } }; - setRenderer(new ListCellRendererWrapper(this) { + setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Module value, int index, boolean selected, boolean hasFocus) { if (value != null) { diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java index 4246006de8c5..5485a8aecd99 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java @@ -276,7 +276,7 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple } public JComponent createComponent() { - myProfiles.setRenderer(new ListCellRendererWrapper(myProfiles.getRenderer()) { + myProfiles.setRenderer(new ListCellRendererWrapper() { @Override public void customize(final JList list, final Profile value, final int index, final boolean selected, final boolean hasFocus) { final String profileName = value.getName(); diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/LevelChooser.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/LevelChooser.java index b35c46ce34e0..2c74b09bbeaa 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/LevelChooser.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/LevelChooser.java @@ -41,7 +41,7 @@ public class LevelChooser extends ComboboxWithBrowseButton { fillModel(model, severityRegistrar); getButton().setToolTipText("Edit severities (" + getButton().getToolTipText(null) + ")"); - comboBox.setRenderer(new ListCellRendererWrapper(comboBox.getRenderer()) { + comboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(final JList list, final HighlightSeverity value, final int index, final boolean selected, final boolean hasFocus) { if (value != null) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/ComboBoxVisibilityPanel.java b/platform/lang-impl/src/com/intellij/refactoring/ui/ComboBoxVisibilityPanel.java index 88d0a3e46c47..e19a15a2a8c5 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/ComboBoxVisibilityPanel.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/ComboBoxVisibilityPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ package com.intellij.refactoring.ui; import com.intellij.refactoring.RefactoringBundle; import com.intellij.ui.ListCellRendererWrapper; import com.intellij.util.IJSwingUtilities; -import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.DialogUtil; import com.intellij.util.ui.UpDownHandler; @@ -68,7 +67,7 @@ public class ComboBoxVisibilityPanel extends VisibilityPanelBase { } protected ListCellRendererWrapper getRenderer() { - return new ListCellRendererWrapper(myComboBox) { + return new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { setText(myNamesMap.get((V)value)); diff --git a/platform/lang-impl/src/com/intellij/tools/ExternalToolsCheckinHandlerFactory.java b/platform/lang-impl/src/com/intellij/tools/ExternalToolsCheckinHandlerFactory.java index ff7d5e58a1b8..cbbfeeebfa46 100644 --- a/platform/lang-impl/src/com/intellij/tools/ExternalToolsCheckinHandlerFactory.java +++ b/platform/lang-impl/src/com/intellij/tools/ExternalToolsCheckinHandlerFactory.java @@ -57,7 +57,7 @@ public class ExternalToolsCheckinHandlerFactory extends CheckinHandlerFactory { ComboboxWithBrowseButton listComponent = new ComboboxWithBrowseButton(); final JComboBox comboBox = listComponent.getComboBox(); comboBox.setModel(new CollectionComboBoxModel(getComboBoxElements(), null)); - comboBox.setRenderer(new ListCellRendererWrapper(comboBox) { + comboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof ToolsGroup) { diff --git a/platform/platform-api/src/com/intellij/ui/HtmlListCellRenderer.java b/platform/platform-api/src/com/intellij/ui/HtmlListCellRenderer.java index e6c44aa6539c..e7dae496eee5 100644 --- a/platform/platform-api/src/com/intellij/ui/HtmlListCellRenderer.java +++ b/platform/platform-api/src/com/intellij/ui/HtmlListCellRenderer.java @@ -23,27 +23,12 @@ import javax.swing.*; import static com.intellij.ui.SimpleColoredComponent.formatLink; import static com.intellij.ui.SimpleColoredComponent.formatText; -/** - *

Replacement for {@link ColoredListCellRenderer}, L&F friendly. - * - *

From {@link #customize(javax.swing.JList, Object, int, boolean, boolean)}, - * text fragments should be added via {@link #append(String, SimpleTextAttributes)}.
- * Note that not all styles from SimpleTextAttributes are supported, see method code for details. - * - *

Alternatively, item can be rendered by {@link com.intellij.openapi.roots.ui.CellAppearanceEx#customize(HtmlListCellRenderer)}. - * - * @param type of list items. - */ public abstract class HtmlListCellRenderer extends ListCellRendererWrapper { private StringBuilder myText; - /** - * Default JComboBox cell renderer should be passed here. - * @param listCellRenderer Default cell renderer ({@link javax.swing.JComboBox#getRenderer()}). - */ - public HtmlListCellRenderer(final ListCellRenderer listCellRenderer) { - super(listCellRenderer); - } + public HtmlListCellRenderer() { } + + public HtmlListCellRenderer(@SuppressWarnings("UnusedParameters") final ListCellRenderer listCellRenderer) { } @Override public final void customize(final JList list, final T value, final int index, final boolean selected, final boolean hasFocus) { diff --git a/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java b/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java index 9b09b97b7d9d..c064d7207b81 100644 --- a/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java +++ b/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java @@ -30,7 +30,6 @@ import java.awt.*; * @since 30.09.2010 */ public abstract class ListCellRendererWrapper implements ListCellRenderer { - private final ListCellRenderer myOriginalRenderer; private boolean mySeparator; private Icon myIcon; private String myText; @@ -39,29 +38,15 @@ public abstract class ListCellRendererWrapper implements ListCellRenderer { private Color myBackground; private Font myFont; - /** - * A combo box for which this cell renderer is created should be passed here. - * - * @param comboBox The combo box for which this cell renderer is created. - */ - public ListCellRendererWrapper(final JComboBox comboBox) { - myOriginalRenderer = comboBox.getRenderer(); - } + public ListCellRendererWrapper() { } - /** - * Default JComboBox cell renderer should be passed here. - * - * @param listCellRenderer Default cell renderer ({@link javax.swing.JComboBox#getRenderer()}). - */ - public ListCellRendererWrapper(final ListCellRenderer listCellRenderer) { - myOriginalRenderer = listCellRenderer; - } + /** @deprecated please use {@linkplain #ListCellRendererWrapper()} (to remove in IDEA 13) */ + @SuppressWarnings("UnusedDeclaration") public ListCellRendererWrapper(final JComboBox comboBox) { } - public final Component getListCellRendererComponent(final JList list, - final Object value, - final int index, - final boolean isSelected, - final boolean cellHasFocus) { + /** @deprecated please use {@linkplain #ListCellRendererWrapper()} (to remove in IDEA 13) */ + @SuppressWarnings("UnusedDeclaration") public ListCellRendererWrapper(final ListCellRenderer listCellRenderer) { } + + public final Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { mySeparator = false; myIcon = null; myText = null; @@ -85,7 +70,7 @@ public abstract class ListCellRendererWrapper implements ListCellRenderer { return separator; } - final Component component = myOriginalRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + final Component component = new JComboBox().getRenderer().getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (component instanceof JLabel) { final JLabel label = (JLabel)component; label.setIcon(myIcon); diff --git a/platform/platform-api/src/com/intellij/ui/MappingListCellRenderer.java b/platform/platform-api/src/com/intellij/ui/MappingListCellRenderer.java index 1424f4b7bd54..1d1c904b9078 100644 --- a/platform/platform-api/src/com/intellij/ui/MappingListCellRenderer.java +++ b/platform/platform-api/src/com/intellij/ui/MappingListCellRenderer.java @@ -22,7 +22,7 @@ public class MappingListCellRenderer extends ListCellRendererWrapper { private final Map myValueMap; public MappingListCellRenderer(final ListCellRenderer original, final Map valueMap) { - super(original); + super(); myValueMap = valueMap; } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DeveloperRenderer.java b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DeveloperRenderer.java index 4326cfb5fe06..d4b0c5d5b8ba 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DeveloperRenderer.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DeveloperRenderer.java @@ -22,7 +22,7 @@ import javax.swing.*; class DeveloperRenderer extends ListCellRendererWrapper { DeveloperRenderer(ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); } @Override diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java index 35b4fda7bbc8..07a6c1c91bd9 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java @@ -288,7 +288,7 @@ public class AppearanceConfigurable extends BaseConfigurable implements Searchab private static final class MyLafComboBoxRenderer extends ListCellRendererWrapper { public MyLafComboBoxRenderer(final ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); } @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeRenderer.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeRenderer.java index bc34851c7b11..050f91272829 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeRenderer.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeRenderer.java @@ -39,7 +39,7 @@ public class FileTypeRenderer extends ListCellRendererWrapper { } public FileTypeRenderer(final ListCellRenderer renderer, final FileTypeListProvider fileTypeListProvider) { - super(renderer); + super(); myFileTypeListProvider = fileTypeListProvider; } 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 d5cb01779f0c..fb564e9dc435 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 @@ -801,7 +801,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi private static final class MyKeymapRenderer extends ListCellRendererWrapper { public MyKeymapRenderer(final ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); } @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadOnlyStatusDialog.java b/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadOnlyStatusDialog.java index ca6e8a550039..cab984c2c7ad 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadOnlyStatusDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadOnlyStatusDialog.java @@ -1,4 +1,19 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.openapi.vcs.readOnlyHandler; import com.intellij.openapi.project.Project; @@ -88,7 +103,7 @@ public class ReadOnlyStatusDialog extends OptionsDialog { final String defaultChangelist = handleType.getDefaultChangelist(); myChangelist.setModel(new CollectionComboBoxModel(changelists, defaultChangelist)); - myChangelist.setRenderer(new HtmlListCellRenderer(myChangelist.getRenderer()) { + myChangelist.setRenderer(new HtmlListCellRenderer() { @Override protected void doCustomize(JList list, String value, int index, boolean selected, boolean hasFocus) { if (value.equals(defaultChangelist)) { diff --git a/platform/platform-impl/src/com/intellij/platform/NewDirectoryProjectDialog.java b/platform/platform-impl/src/com/intellij/platform/NewDirectoryProjectDialog.java index 63538e109a04..ed63d326c25b 100644 --- a/platform/platform-impl/src/com/intellij/platform/NewDirectoryProjectDialog.java +++ b/platform/platform-impl/src/com/intellij/platform/NewDirectoryProjectDialog.java @@ -141,7 +141,7 @@ public class NewDirectoryProjectDialog extends DialogWrapper { return original; } }; - return new ListCellRendererWrapper(intermediate) { + return new ListCellRendererWrapper() { @Override public void customize(final JList list, final Object value, final int index, final boolean selected, final boolean cellHasFocus) { if (value == null) return; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooserPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooserPanel.java index e79fddefb1e9..56441b761e83 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooserPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooserPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ public class ChangeListChooserPanel extends JPanel { } public void init() { - myExistingListsCombo.setRenderer(new HtmlListCellRenderer(myExistingListsCombo.getRenderer()) { + myExistingListsCombo.setRenderer(new HtmlListCellRenderer() { private final IssueLinkRenderer myLinkRenderer = new IssueLinkRenderer(myProject, this); @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java index d48ff3cafcf9..7e8dda7bcbe2 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -230,7 +230,7 @@ public class MultipleChangeListBrowser extends ChangesBrowser { public ChangeListChooser(List lists) { super(new BorderLayout(4, 2)); myChooser = new JComboBox(); - myChooser.setRenderer(new HtmlListCellRenderer(myChooser.getRenderer()) { + myChooser.setRenderer(new HtmlListCellRenderer() { @Override protected void doCustomize(JList list, LocalChangeList value, int index, boolean selected, boolean hasFocus) { if (value != null) { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/ThreadComboBoxRenderer.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/ThreadComboBoxRenderer.java index 3e894a2e916f..7e4849bc740e 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/ThreadComboBoxRenderer.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/ThreadComboBoxRenderer.java @@ -25,7 +25,7 @@ import javax.swing.*; */ public class ThreadComboBoxRenderer extends ListCellRendererWrapper { public ThreadComboBoxRenderer(JComboBox comboBox) { - super(comboBox); + super(); } @Override diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java index b2214a4864d5..058503dade8b 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java @@ -117,7 +117,7 @@ public class InjectLanguageAction implements IntentionAction { Arrays.sort(langIds); final JList list = new JBList(langIds); - list.setCellRenderer(new ListCellRendererWrapper(list.getCellRenderer()) { + list.setCellRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, String value, int index, boolean selected, boolean hasFocus) { final Language language = InjectedLanguage.findLanguageById(value); diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java index b7c58bde02be..ff5714276583 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java @@ -55,7 +55,7 @@ public class LanguagePanel extends AbstractInjectionPanel { Arrays.sort(languageIDs); myLanguage.setModel(new DefaultComboBoxModel(languageIDs)); - myLanguage.setRenderer(new HtmlListCellRenderer(myLanguage.getRenderer()) { + myLanguage.setRenderer(new HtmlListCellRenderer() { final Set IDs = new HashSet(Arrays.asList(languageIDs)); @Override diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.java b/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.java index 33631fc196ab..6fa05e4fdad0 100644 --- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.java +++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.java @@ -50,7 +50,7 @@ public abstract class CreateResourceDirectoryDialog extends DialogWrapper { super(project); myResourceTypeComboBox.setModel(new EnumComboBoxModel(ResourceFolderType.class)); - myResourceTypeComboBox.setRenderer(new ListCellRendererWrapper(myResourceTypeComboBox.getRenderer()) { + myResourceTypeComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof ResourceFolderType) { diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java index 89f3e10d226b..399868e11adc 100644 --- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java +++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java @@ -58,7 +58,7 @@ class ChooseModuleStep extends ExportSignedPackageWizardStep { } myModuleCombo.setModel(new CollectionComboBoxModel(facets, selection)); - myModuleCombo.setRenderer(new ListCellRendererWrapper(myModuleCombo.getRenderer()) { + myModuleCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, AndroidFacet value, int index, boolean selected, boolean hasFocus) { final Module module = value.getModule(); diff --git a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java index 8e35c4c6c720..76c5a330bc49 100644 --- a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java +++ b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.java @@ -155,7 +155,7 @@ public abstract class AndroidLogcatToolWindowView implements Disposable { updateLogConsole(); } }); - myDeviceCombo.setRenderer(new ListCellRendererWrapper(myDeviceCombo.getRenderer()) { + myDeviceCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value == null) { diff --git a/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java b/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java index 13c008aa6978..98df700dd881 100644 --- a/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java +++ b/plugins/android/src/org/jetbrains/android/logcat/EditLogFilterDialog.java @@ -101,7 +101,7 @@ class EditLogFilterDialog extends DialogWrapper { myPidFieldWrapper.add(myPidField); myLogLevelCombo.setModel(new EnumComboBoxModel(Log.LogLevel.class)); - myLogLevelCombo.setRenderer(new ListCellRendererWrapper(myLogLevelCombo.getRenderer()) { + myLogLevelCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value != null) { diff --git a/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java b/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java index 8ad5d63362e5..fb49e257046d 100644 --- a/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java +++ b/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java @@ -32,7 +32,7 @@ import java.util.List; */ public class AndroidModulesComboBox extends JComboBox { public AndroidModulesComboBox() { - setRenderer(new ListCellRendererWrapper(getRenderer()) { + setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof Module) { diff --git a/plugins/android/src/org/jetbrains/android/newProject/AndroidSdkComboBoxWithBrowseButton.java b/plugins/android/src/org/jetbrains/android/newProject/AndroidSdkComboBoxWithBrowseButton.java index c28593b1710a..57e91918a008 100644 --- a/plugins/android/src/org/jetbrains/android/newProject/AndroidSdkComboBoxWithBrowseButton.java +++ b/plugins/android/src/org/jetbrains/android/newProject/AndroidSdkComboBoxWithBrowseButton.java @@ -39,7 +39,7 @@ public class AndroidSdkComboBoxWithBrowseButton extends ComboboxWithBrowseButton public AndroidSdkComboBoxWithBrowseButton() { final JComboBox sdkCombobox = getComboBox(); - sdkCombobox.setRenderer(new ListCellRendererWrapper(sdkCombobox.getRenderer()) { + sdkCombobox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof Sdk) { diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java index dd3122435069..b663ea42475e 100644 --- a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java +++ b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java @@ -153,7 +153,7 @@ public class AndroidRunConfigurationEditor(myTargetBox.getRenderer()) { + myTargetBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, IAndroidTarget value, int index, boolean selected, boolean hasFocus) { setText(AndroidSdkUtils.getPresentableTargetName(value)); } }); - myAbiCombo.setRenderer(new ListCellRendererWrapper(myAbiCombo.getRenderer()) { + myAbiCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, String value, int index, boolean selected, boolean hasFocus) { if (value != null) { diff --git a/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java b/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java index 6dbce36086f1..4141b5436034 100644 --- a/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java +++ b/plugins/android/src/org/jetbrains/android/run/ExtendedDeviceChooserDialog.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.jetbrains.android.run; import com.android.ddmlib.IDevice; @@ -73,7 +88,7 @@ public class ExtendedDeviceChooserDialog extends DialogWrapper { Disposer.register(myDisposable, myAvdCombo); - myAvdCombo.getComboBox().setRenderer(new HtmlListCellRenderer(myAvdCombo.getComboBox().getRenderer()) { + myAvdCombo.getComboBox().setRenderer(new HtmlListCellRenderer() { @Override protected void doCustomize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value == null) { diff --git a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java index 843436443639..b0c2953c842f 100644 --- a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java +++ b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java @@ -54,7 +54,7 @@ class AndroidSdkConfigurableForm { public AndroidSdkConfigurableForm(@NotNull SdkModel sdkModel, @NotNull final SdkModificator sdkModificator) { mySdkModel = sdkModel; myInternalJdkComboBox.setModel(myJdksModel); - myInternalJdkComboBox.setRenderer(new ListCellRendererWrapper(myInternalJdkComboBox.getRenderer()) { + myInternalJdkComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof Sdk) { @@ -64,7 +64,7 @@ class AndroidSdkConfigurableForm { }); myBuildTargetComboBox.setModel(myBuildTargetsModel); - myBuildTargetComboBox.setRenderer(new ListCellRendererWrapper(myBuildTargetComboBox.getRenderer()) { + myBuildTargetComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof IAndroidTarget) { diff --git a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java index a0f311e3784f..37e63ae43286 100644 --- a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java +++ b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowForm.java @@ -157,7 +157,7 @@ class AndroidLayoutPreviewToolWindowForm implements Disposable { myNightCombo = new ComboBox(); myComboPanel.add(myNightCombo, gb); - myDevicesCombo.setRenderer(new ListCellRendererWrapper(myDevicesCombo.getRenderer()) { + myDevicesCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof LayoutDevice) { @@ -170,7 +170,7 @@ class AndroidLayoutPreviewToolWindowForm implements Disposable { } }); - myDeviceConfigurationsCombo.setRenderer(new ListCellRendererWrapper(myDeviceConfigurationsCombo.getRenderer()) { + myDeviceConfigurationsCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof LayoutDeviceConfiguration) { @@ -320,7 +320,7 @@ class AndroidLayoutPreviewToolWindowForm implements Disposable { myScrollPane.getVerticalScrollBar().setUnitIncrement(5); myDockModeCombo.setModel(new DefaultComboBoxModel(UiMode.values())); - myDockModeCombo.setRenderer(new ListCellRendererWrapper(myDockModeCombo.getRenderer()) { + myDockModeCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { setText(((UiMode)value).getLongDisplayValue()); @@ -335,14 +335,14 @@ class AndroidLayoutPreviewToolWindowForm implements Disposable { }; myNightCombo.setModel(new DefaultComboBoxModel(NightMode.values())); - myNightCombo.setRenderer(new ListCellRendererWrapper(myNightCombo.getRenderer()) { + myNightCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { setText(((NightMode)value).getLongDisplayValue()); } }); - myTargetCombo.setRenderer(new ListCellRendererWrapper(myTargetCombo.getRenderer()) { + myTargetCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof IAndroidTarget) { @@ -998,7 +998,7 @@ class AndroidLayoutPreviewToolWindowForm implements Disposable { } myThemeCombo.setModel(new CollectionComboBoxModel(themes, selection)); - myThemeCombo.setRenderer(new ListCellRendererWrapper(myThemeCombo.getRenderer()) { + myThemeCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof ThemeData) { diff --git a/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java b/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java index e489e9101e1b..fa269289a8f2 100644 --- a/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java +++ b/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java @@ -516,7 +516,7 @@ public abstract class DeviceConfiguratorPanel extends JPanel { } }); - myComboBox.setRenderer(new ListCellRendererWrapper(myComboBox.getRenderer()) { + myComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof ResourceEnum) { diff --git a/plugins/android/src/org/jetbrains/android/util/ModuleListCellRendererWrapper.java b/plugins/android/src/org/jetbrains/android/util/ModuleListCellRendererWrapper.java index 5e965d880af9..b46129f684f4 100644 --- a/plugins/android/src/org/jetbrains/android/util/ModuleListCellRendererWrapper.java +++ b/plugins/android/src/org/jetbrains/android/util/ModuleListCellRendererWrapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.jetbrains.android.util; import com.intellij.openapi.module.Module; @@ -11,7 +26,7 @@ import javax.swing.*; */ public class ModuleListCellRendererWrapper extends ListCellRendererWrapper { public ModuleListCellRendererWrapper(ListCellRenderer renderer) { - super(renderer); + super(); } @Override diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java index 90fa57cd22bd..ae51860daa77 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java @@ -87,7 +87,7 @@ public class ProjectSettingsPanel { myScopeMappingTable = new TableView(myScopeMappingModel); fillCopyrightProfiles(); - myProfilesComboBox.setRenderer(new ListCellRendererWrapper(myProfilesComboBox.getRenderer()) { + myProfilesComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, CopyrightProfile value, int index, boolean selected, boolean hasFocus) { if (value == null) { diff --git a/plugins/devkit/src/projectRoots/IdeaJdkConfigurable.java b/plugins/devkit/src/projectRoots/IdeaJdkConfigurable.java index 1680ab078889..3eb4c5f97431 100644 --- a/plugins/devkit/src/projectRoots/IdeaJdkConfigurable.java +++ b/plugins/devkit/src/projectRoots/IdeaJdkConfigurable.java @@ -131,7 +131,7 @@ public class IdeaJdkConfigurable implements AdditionalDataConfigurable { GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); wholePanel.add(myInternalJres, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 1, 1, GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(0, 30, 0, 0), 0, 0)); - myInternalJres.setRenderer(new ListCellRendererWrapper(myInternalJres.getRenderer()) { + myInternalJres.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof Sdk) { diff --git a/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java b/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java index bc1384935b19..1f20c1b4d4b1 100644 --- a/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java +++ b/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -222,7 +222,7 @@ class GitManualPushToBranch extends JPanel { private static class RemoteCellRenderer extends ListCellRendererWrapper { public RemoteCellRenderer(final ListCellRenderer listCellRenderer) { - super(listCellRenderer); + super(); } @Override diff --git a/plugins/git4idea/src/git4idea/ui/GitRepositoryComboboxListCellRenderer.java b/plugins/git4idea/src/git4idea/ui/GitRepositoryComboboxListCellRenderer.java index edd8276d6e1e..92532bfd78c1 100644 --- a/plugins/git4idea/src/git4idea/ui/GitRepositoryComboboxListCellRenderer.java +++ b/plugins/git4idea/src/git4idea/ui/GitRepositoryComboboxListCellRenderer.java @@ -32,7 +32,7 @@ public class GitRepositoryComboboxListCellRenderer extends ListCellRendererWrapp private static final DefaultListCellRenderer DEFAULT_RENDERER = new DefaultListCellRenderer(); public GitRepositoryComboboxListCellRenderer(final JComboBox comboBox) { - super(comboBox); + super(); } @Override diff --git a/plugins/git4idea/src/git4idea/util/GitUIUtil.java b/plugins/git4idea/src/git4idea/util/GitUIUtil.java index b62c1b18944f..cecfba431b1e 100644 --- a/plugins/git4idea/src/git4idea/util/GitUIUtil.java +++ b/plugins/git4idea/src/git4idea/util/GitUIUtil.java @@ -157,7 +157,7 @@ public class GitUIUtil { * @param listCellRenderer */ public static ListCellRenderer getVirtualFileListCellRenderer(final ListCellRenderer listCellRenderer) { - return new ListCellRendererWrapper(listCellRenderer) { + return new ListCellRendererWrapper() { @Override public void customize(final JList list, final VirtualFile file, final int index, final boolean selected, final boolean hasFocus) { setText(file == null || !file.isValid() ? "(invalid)" : file.getPresentableUrl()); @@ -187,7 +187,7 @@ public class GitUIUtil { */ public static ListCellRenderer getGitRemoteListCellRenderer(final String defaultRemote, final boolean fetchUrl, final ListCellRenderer listCellRenderer) { - return new ListCellRendererWrapper(listCellRenderer) { + return new ListCellRendererWrapper() { @Override public void customize(final JList list, final GitDeprecatedRemote remote, final int index, final boolean selected, final boolean hasFocus) { final String text; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java index 74cc3f0b21a1..45090d6d3816 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java @@ -26,7 +26,7 @@ import javax.swing.*; */ public class ModuleCellRenderer extends ListCellRendererWrapper { public ModuleCellRenderer(ListCellRenderer renderer) { - super(renderer); + super(); } @Override diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ParameterTablePanel.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ParameterTablePanel.java index db93d9e8aab7..cccdaa336a3d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ParameterTablePanel.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/ParameterTablePanel.java @@ -98,7 +98,7 @@ public abstract class ParameterTablePanel extends JPanel { myTypeRendererCombo.setOpaque(true); myTypeRendererCombo.setBorder(null); - myTypeRendererCombo.setRenderer(new ListCellRendererWrapper(myTypeRendererCombo.getRenderer()) { + myTypeRendererCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, ParameterInfo info, int index, boolean selected, boolean hasFocus) { PsiType type = info.getType(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java index 8d9ff4540634..85d3680d1c64 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java @@ -123,7 +123,7 @@ public class GroovyRunConfigurationEditor extends SettingsEditor(myModulesBox.getRenderer()) { + myModulesBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Module module, int index, boolean selected, boolean hasFocus) { if (module != null) { diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java index c605fdd2a42f..9821c82e8ee7 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java +++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java @@ -147,7 +147,7 @@ public class JUnitConfigurable extends SettingsEditor implem aModel.addElement(JUnitConfigurationModel.CLASS); aModel.addElement(JUnitConfigurationModel.METHOD); myTypeChooser.setModel(aModel); - myTypeChooser.setRenderer(new ListCellRendererWrapper(myTypeChooser) { + myTypeChooser.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Integer value, int index, boolean selected, boolean hasFocus) { switch (value) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java index 3384aa27d2f7..24af3f0c9b33 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java @@ -72,7 +72,7 @@ public class MavenImportingSettingsForm { myUpdateFoldersOnImportPhaseComboBox.setModel(new DefaultComboBoxModel(MavenImportingSettings.UPDATE_FOLDERS_PHASES)); myGeneratedSourcesComboBox.setModel(new EnumComboBoxModel(MavenImportingSettings.GeneratedSourcesFolder.class)); - myGeneratedSourcesComboBox.setRenderer(new ListCellRendererWrapper(myGeneratedSourcesComboBox.getRenderer()) { + myGeneratedSourcesComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof MavenImportingSettings.GeneratedSourcesFolder) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java index 2611a38414b4..41aba46fdfb2 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java @@ -134,7 +134,7 @@ public final class GuiDesignerConfigurable implements SearchableConfigurable, Co myGeneralUI.myChkCopyFormsRuntime.setSelected(configuration.COPY_FORMS_RUNTIME_TO_OUTPUT); myGeneralUI.myLayoutManagerCombo.setModel(new DefaultComboBoxModel(LayoutManagerRegistry.getNonDeprecatedLayoutManagerNames())); - myGeneralUI.myLayoutManagerCombo.setRenderer(new ListCellRendererWrapper(myGeneralUI.myLayoutManagerCombo.getRenderer()) { + myGeneralUI.myLayoutManagerCombo.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, String value, int index, boolean selected, boolean hasFocus) { setText(LayoutManagerRegistry.getLayoutManagerDisplayName(value)); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/BorderTypeEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/BorderTypeEditor.java index bcaa8f0c9ed3..7a2d63136587 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/BorderTypeEditor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/BorderTypeEditor.java @@ -29,7 +29,7 @@ import javax.swing.*; public final class BorderTypeEditor extends ComboBoxPropertyEditor { public BorderTypeEditor(){ myCbx.setModel(new DefaultComboBoxModel(BorderType.getAllTypes())); - myCbx.setRenderer(new ListCellRendererWrapper(myCbx.getRenderer()) { + myCbx.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, BorderType value, int index, boolean selected, boolean hasFocus) { final BorderType type = value != null ? value : BorderType.NONE; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/ButtonGroupProperty.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/ButtonGroupProperty.java index 46225b37a5fa..d69835f5a33e 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/ButtonGroupProperty.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/ButtonGroupProperty.java @@ -81,7 +81,7 @@ public class ButtonGroupProperty extends Property private RadComponent myComponent; public MyPropertyEditor() { - myCbx.setRenderer(new ListCellRendererWrapper(myCbx.getRenderer()) { + myCbx.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, RadButtonGroup value, int index, boolean selected, boolean hasFocus) { if (value == null) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/LayoutManagerProperty.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/LayoutManagerProperty.java index 79b826b47a4f..8e2160bf31a1 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/LayoutManagerProperty.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/LayoutManagerProperty.java @@ -45,7 +45,7 @@ public class LayoutManagerProperty extends Property { private static class LayoutManagerEditor extends ComboBoxPropertyEditor { public LayoutManagerEditor() { - myCbx.setRenderer(new ListCellRendererWrapper(myCbx.getRenderer()) { + myCbx.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, String value, int index, boolean selected, boolean hasFocus) { setText(LayoutManagerRegistry.getLayoutManagerDisplayName(value)); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java index ae90577c4bbd..762a6b5f822b 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java @@ -271,7 +271,7 @@ class XsltRunSettingsEditor extends SettingsEditor { final Module[] modules = ModuleManager.getInstance(project).getModules(); myModule.setModel(new DefaultComboBoxModel(ArrayUtil.mergeArrays(new Object[]{""}, modules))); - myModule.setRenderer(new ListCellRendererWrapper(myModule) { + myModule.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) { if (value instanceof Module) { @@ -303,7 +303,7 @@ class XsltRunSettingsEditor extends SettingsEditor { myJdkChoice.setEnabled(false); myJDK.setEnabled(false); } - myJDK.setRenderer(new ListCellRendererWrapper(myJDK) { + myJDK.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, final Sdk jdk, int index, boolean isSelected, boolean cellHasFocus) { if (jdk != null) { diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java index 2cb145aa2319..c80b0a0cfdb1 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java @@ -92,7 +92,7 @@ public class ScopePanel extends JPanel implements Disposable{ myCustomScope.setSelected(scope.getScopeType() == SearchScope.ScopeType.CUSTOM); myModuleSelection.setModel(createModel(ModuleManager.getInstance(myProject).getModules())); - myModuleSelection.setRenderer(new ListCellRendererWrapper(myModuleSelection) { + myModuleSelection.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, Module m, int index, boolean selected, boolean hasFocus) { if (m != null) { diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/InputExpressionDialog.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/InputExpressionDialog.java index b040f9d17ee3..56d627edadcd 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/InputExpressionDialog.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/InputExpressionDialog.java @@ -129,7 +129,7 @@ public abstract class InputExpressionDialog extends }); myComboboxEditor = new EditorTextField(myDocument, project, XPathFileType.XPATH); - myComboBox.setRenderer(new ListCellRendererWrapper(myComboBox) { + myComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, HistoryElement value, int index, boolean selected, boolean hasFocus) { setText(value.expression); diff --git a/xml/impl/src/com/intellij/ide/browsers/BrowserSelector.java b/xml/impl/src/com/intellij/ide/browsers/BrowserSelector.java index 50e80ce74764..7733e8dbb54b 100644 --- a/xml/impl/src/com/intellij/ide/browsers/BrowserSelector.java +++ b/xml/impl/src/com/intellij/ide/browsers/BrowserSelector.java @@ -55,7 +55,7 @@ public class BrowserSelector { }); final JComboBox comboBox = myBrowserComboWithBrowse.getComboBox(); - comboBox.setRenderer(new ListCellRendererWrapper(comboBox.getRenderer()) { + comboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, BrowsersConfiguration.BrowserFamily value,