From 1cc41176eb55a66a466fe1699b5aa77cda60fcd8 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Wed, 30 Mar 2011 10:40:36 +0400 Subject: [PATCH] IDEA-67217 Introduce parameter should specify its type explicitly by default --- .../introduce/parameter/GrIntroduceParameterDialog.java | 2 +- .../plugins/groovy/refactoring/ui/GrTypeComboBox.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java index 6c2fc2c54651..a872e2c6b352 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java @@ -180,7 +180,7 @@ public class GrIntroduceParameterDialog extends RefactoringDialog implements GrI } private void createUIComponents() { - myTypeComboBox = new GrTypeComboBox(myContext.var != null ? myContext.var.getDeclaredType() : myContext.expression.getType()); + myTypeComboBox = new GrTypeComboBox(myContext.var != null ? myContext.var.getDeclaredType() : myContext.expression.getType(), true); String[] possibleNames = GroovyNameSuggestionUtil.suggestVariableNames(myContext.expression, new GroovyFieldValidator(myContext), true); if (myContext.var != null) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/GrTypeComboBox.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/GrTypeComboBox.java index 80c3c2eb6276..4f17c158c0ec 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/GrTypeComboBox.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/ui/GrTypeComboBox.java @@ -29,9 +29,16 @@ public class GrTypeComboBox extends JComboBox { private final PsiType myType; public GrTypeComboBox(PsiType type) { + this(type, false); + } + + public GrTypeComboBox(PsiType type, boolean selectType) { super(); myType = type; initialize(); + if (selectType && getItemCount() > 1) { + setSelectedIndex(1); + } } private void initialize() {