From 3294bc5e9f645db2143a7e0024e9c63a9f862829 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 31 Dec 2013 19:28:44 +0100 Subject: [PATCH] simplify Combobox ctor +review use idea Combobox --- .../makeStatic/MakeParameterizedStaticDialog.java | 2 +- .../template/impl/LiveTemplateSettingsEditor.java | 2 +- .../lang-impl/src/com/intellij/find/impl/FindDialog.java | 6 ++++-- .../com/intellij/refactoring/ui/NameSuggestionsField.java | 2 +- .../platform-api/src/com/intellij/openapi/ui/ComboBox.java | 4 ++++ .../jetbrains/plugins/groovy/mvc/MvcRunTargetDialog.java | 2 +- .../jetbrains/idea/maven/execution/MavenEditGoalDialog.java | 4 ++-- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java index 0cea7b1fa7c3..fa471dfa3a6e 100644 --- a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java @@ -272,7 +272,7 @@ public class MakeParameterizedStaticDialog extends AbstractMakeStaticDialog { } private JComboBox createComboBoxForName() { - final ComboBox combobox = new ComboBox(myNameSuggestions,-1); + final ComboBox combobox = new ComboBox(myNameSuggestions); combobox.setEditable(true); combobox.setSelectedIndex(0); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java index 2ff02defd9c0..748f684c5143 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java @@ -233,7 +233,7 @@ public class LiveTemplateSettingsEditor extends JPanel { gbConstraints.gridx = 1; gbConstraints.insets = new Insets(0, 4, 0, 0); - myExpandByCombo = new ComboBox(new Object[]{myDefaultShortcutItem, SPACE, TAB, ENTER}, -1); + myExpandByCombo = new ComboBox(new String[]{myDefaultShortcutItem, SPACE, TAB, ENTER}); myExpandByCombo.addItemListener(new ItemListener() { @Override public void itemStateChanged(ItemEvent e) { diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java index 417ad69d767f..e7c4aac7cafe 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java @@ -64,8 +64,10 @@ import javax.swing.*; import javax.swing.text.BadLocationException; import java.awt.*; import java.awt.event.*; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; @@ -766,7 +768,7 @@ public class FindDialog extends DialogWrapper { } Arrays.sort(names,String.CASE_INSENSITIVE_ORDER); - myModuleComboBox = new ComboBox(names, -1); + myModuleComboBox = new ComboBox(names); scopePanel.add(myModuleComboBox, gbConstraints); if (modules.length == 1) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java b/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java index 5c2aeece037f..66ada6f15b63 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java @@ -73,7 +73,7 @@ public class NameSuggestionsField extends JPanel { myComponent = createTextFieldForName(nameSuggestions, fileType); } else { - final ComboBox combobox = new ComboBox(nameSuggestions,-1); + final ComboBox combobox = new ComboBox(nameSuggestions); combobox.setSelectedIndex(0); setupComboBox(combobox, fileType); myComponent = combobox; diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java b/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java index beded7f92f8c..9f7b076340ea 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java @@ -23,6 +23,7 @@ import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.components.JBList; import com.intellij.util.ui.MacUIUtil; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -194,6 +195,9 @@ public class ComboBox extends ComboBoxWithWidePopup implements AWTEventListener registerCancelOnEscape(); } + public ComboBox(@NotNull Object[] items) { + this(items, -1); + } public boolean isSwingPopup() { return mySwingPopup; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetDialog.java index 9be41ebdedb6..30e158cdc6d3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetDialog.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetDialog.java @@ -168,7 +168,7 @@ public class MvcRunTargetDialog extends DialogWrapper { } private void createUIComponents() { - myTargetField = new ComboBox(MvcRunTargetHistoryService.getInstance().getHistory(), -1); + myTargetField = new ComboBox(MvcRunTargetHistoryService.getInstance().getHistory()); myTargetField.setLightWeightPopupEnabled(false); EditorComboBoxEditor editor = new StringComboboxEditor(myModule.getProject(), PlainTextFileType.INSTANCE, myTargetField); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenEditGoalDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenEditGoalDialog.java index 4f0b9991ce42..148edeb37830 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenEditGoalDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenEditGoalDialog.java @@ -25,6 +25,7 @@ import com.intellij.ui.EditorComboBoxEditor; import com.intellij.ui.EditorComboBoxRenderer; import com.intellij.ui.EditorTextField; import com.intellij.ui.StringComboboxEditor; +import com.intellij.util.ArrayUtilRt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.model.MavenConstants; @@ -74,8 +75,7 @@ public class MavenEditGoalDialog extends DialogWrapper { goalsLabel.setLabelFor(goalsEditor); } else { - //noinspection SSBasedInspection - goalsComboBox = new ComboBox(myHistory.toArray(new String[myHistory.size()]), -1); + goalsComboBox = new ComboBox(ArrayUtilRt.toStringArray(myHistory)); goalComponent = goalsComboBox; goalsLabel.setLabelFor(goalsComboBox);