From 9823062c8a32695af91501174ddc4e65ce14db7c Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 25 Aug 2011 18:18:02 +0200 Subject: [PATCH] don't show chooser if single occurrence --- .../introduce/inplace/OccurrencesChooser.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/OccurrencesChooser.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/OccurrencesChooser.java index 128455e5656f..c3a852d9501f 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/OccurrencesChooser.java +++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/OccurrencesChooser.java @@ -66,10 +66,15 @@ public class OccurrencesChooser { } public void showChooser(final T selectedOccurrence, final List allOccurrences, final Pass callback) { - Map> occurrencesMap = Maps.newLinkedHashMap(); - occurrencesMap.put(ReplaceChoice.NO, Collections.singletonList(selectedOccurrence)); - occurrencesMap.put(ReplaceChoice.ALL, allOccurrences); - showChooser(callback, occurrencesMap); + if (allOccurrences.size() == 1) { + callback.pass(ReplaceChoice.ALL); + } + else { + Map> occurrencesMap = Maps.newLinkedHashMap(); + occurrencesMap.put(ReplaceChoice.NO, Collections.singletonList(selectedOccurrence)); + occurrencesMap.put(ReplaceChoice.ALL, allOccurrences); + showChooser(callback, occurrencesMap); + } } public void showChooser(final Pass callback, final Map> occurrencesMap) {