From 1cb32bdaa0cb7c6870eb5dada2bd55877483b856 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Tue, 14 Sep 2010 21:00:40 +0400
Subject: [PATCH] change signature: break if default value was not set

---
 .../changeSignature/ChangeSignatureProcessor.java          | 2 +-
 .../changeSignature/JavaChangeSignatureUsageProcessor.java | 7 +++++--
 .../changeSignature/ChangeSignatureUsageProcessor.java     | 2 +-
 .../changeSignature/GrChangeSignatureUsageProcessor.java   | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
index 3f31c68e55be..064af0cebb70 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
@@ -131,7 +131,7 @@ public class ChangeSignatureProcessor extends ChangeSignatureProcessorBase {
 
   protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {
     for (ChangeSignatureUsageProcessor processor : ChangeSignatureUsageProcessor.EP_NAME.getExtensions()) {
-      processor.setupDefaultValues(myChangeInfo, refUsages, myProject);
+      if (!processor.setupDefaultValues(myChangeInfo, refUsages, myProject)) return false;
     }
     MultiMap<PsiElement, String> conflictDescriptions = new MultiMap<PsiElement, String>();
     for (ChangeSignatureUsageProcessor usageProcessor : ChangeSignatureUsageProcessor.EP_NAME.getExtensions()) {
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
index b878b76f45ad..db4a5af670b3 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
@@ -533,8 +533,8 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
   }
 
   @Override
-  public void setupDefaultValues(ChangeInfo changeInfo, Ref<UsageInfo[]> refUsages, Project project) {
-    if (!(changeInfo instanceof JavaChangeInfo)) return;
+  public boolean setupDefaultValues(ChangeInfo changeInfo, Ref<UsageInfo[]> refUsages, Project project) {
+    if (!(changeInfo instanceof JavaChangeInfo)) return true;
     for (UsageInfo usageInfo : refUsages.get()) {
       if (usageInfo instanceof  MethodCallUsageInfo) {
         MethodCallUsageInfo methodCallUsageInfo = (MethodCallUsageInfo)usageInfo;
@@ -558,6 +558,8 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
                     } else {
                       ((ParameterInfoImpl)parameter).setDefaultValue(chooser.getDefaultValue());
                     }
+                  } else {
+                    return false;
                   }
                 }
               }
@@ -566,6 +568,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
         }
       }
     }
+    return true;
   }
 
   private static boolean needDefaultValue(ChangeInfo changeInfo, PsiMethod method) {
diff --git a/platform/lang-api/src/com/intellij/refactoring/changeSignature/ChangeSignatureUsageProcessor.java b/platform/lang-api/src/com/intellij/refactoring/changeSignature/ChangeSignatureUsageProcessor.java
index a798a1e96d25..99fd6956efe8 100644
--- a/platform/lang-api/src/com/intellij/refactoring/changeSignature/ChangeSignatureUsageProcessor.java
+++ b/platform/lang-api/src/com/intellij/refactoring/changeSignature/ChangeSignatureUsageProcessor.java
@@ -39,5 +39,5 @@ public interface ChangeSignatureUsageProcessor {
 
   boolean shouldPreviewUsages(ChangeInfo changeInfo, UsageInfo[] usages);
 
-  void setupDefaultValues(ChangeInfo changeInfo, Ref<UsageInfo[]> refUsages, Project project);
+  boolean setupDefaultValues(ChangeInfo changeInfo, Ref<UsageInfo[]> refUsages, Project project);
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java
index c975352fff7e..95db68497a57 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java
@@ -118,7 +118,8 @@ public class GrChangeSignatureUsageProcessor implements ChangeSignatureUsageProc
   }
 
   @Override
-  public void setupDefaultValues(ChangeInfo changeInfo, Ref<UsageInfo[]> refUsages, Project project) {
+  public boolean setupDefaultValues(ChangeInfo changeInfo, Ref<UsageInfo[]> refUsages, Project project) {
+    return true;
   }
 
   private static boolean generateDelegate(GrChangeInfoImpl grInfo) {