From 35c1b358330ed62038826079fd8d7bbf62475ac1 Mon Sep 17 00:00:00 2001
From: "Kirill.Safonov" <kirill.safonov@swiftteams.com>
Date: Mon, 20 Sep 2010 12:40:35 +0400
Subject: [PATCH] AS change signature (IDEA-26353) in progres

---
 .../JavaChangeSignatureDialog.java               |  5 -----
 .../changeSignature/JavaMethodDescriptor.java    | 10 ++++++++++
 .../ChangeSignatureDialogBase.java               | 16 +++++++++++-----
 .../changeSignature/MethodDescriptor.java        |  4 ++++
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDialog.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDialog.java
index 585afde4c309..f21e38819c01 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDialog.java
@@ -347,11 +347,6 @@ public class JavaChangeSignatureDialog extends ChangeSignatureDialogBase<Paramet
     return null;
   }
 
-  @Override
-  protected boolean isResolvableType(ParameterInfoImpl info, MethodDescriptor<ParameterInfoImpl> method) {
-    return RefactoringUtil.isResolvableType(info.createType(myMethod.getMethod(), PsiManager.getInstance(myProject)));
-  }
-
   @Override
   protected String calculateSignature() {
     return doCalculateSignature(myMethod.getMethod());
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaMethodDescriptor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaMethodDescriptor.java
index fea00e94d8dd..deebf0cd5b0c 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaMethodDescriptor.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaMethodDescriptor.java
@@ -82,4 +82,14 @@ public class JavaMethodDescriptor implements MethodDescriptor<ParameterInfoImpl>
     PsiClass containingClass = myMethod.getContainingClass();
     return containingClass != null && !containingClass.isInterface();
   }
+
+  @Override
+  public boolean canChangeParameters() {
+    return true;
+  }
+
+  @Override
+  public boolean canChangeReturnType() {
+    return true;
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
index 2cf402aab74e..6bc82f039328 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialogBase.java
@@ -93,8 +93,6 @@ public abstract class ChangeSignatureDialogBase<P extends ParameterInfo, M exten
 
   protected abstract String validateAndCommitData();
 
-  protected abstract boolean isResolvableType(P info, MethodDescriptor<P> method);
-
   public ChangeSignatureDialogBase(Project project, final D method, boolean allowDelegation, PsiElement defaultValueContext) {
     super(project, true);
     myMethod = method;
@@ -203,6 +201,10 @@ public abstract class ChangeSignatureDialogBase<P extends ParameterInfo, M exten
       typePrompt.setLabelFor(myReturnTypeField);
       panel.add(myReturnTypeField);
 
+      if (!myMethod.canChangeReturnType()) {
+        myReturnTypeField.setEnabled(false);
+      }
+
       final DocumentListener documentListener = new DocumentListener() {
         public void beforeDocumentChange(DocumentEvent event) {
         }
@@ -230,11 +232,13 @@ public abstract class ChangeSignatureDialogBase<P extends ParameterInfo, M exten
   protected JComponent createCenterPanel() {
     JPanel panel = new JPanel(new BorderLayout());
     JPanel subPanel = new JPanel(new BorderLayout());
-    subPanel.add(createParametersPanel(), BorderLayout.CENTER);
+    if (myMethod.canChangeParameters()) {
+      subPanel.add(createParametersPanel(), BorderLayout.CENTER);
+    }
 
     if (myMethod.canChangeVisibility()) {
       JPanel visibilityPanel = createVisibilityPanel(subPanel);
-      subPanel.add(visibilityPanel, BorderLayout.EAST);
+      subPanel.add(visibilityPanel, myMethod.canChangeParameters() ? BorderLayout.EAST : BorderLayout.CENTER);
     }
 
     panel.add(subPanel, BorderLayout.CENTER);
@@ -381,7 +385,9 @@ public abstract class ChangeSignatureDialogBase<P extends ParameterInfo, M exten
   protected abstract String calculateSignature();
 
   protected void doAction() {
-    TableUtil.stopEditing(myParametersTable);
+    if (myParametersTable != null) {
+      TableUtil.stopEditing(myParametersTable);
+    }
     String message = validateAndCommitData();
     if (message != null) {
       if (message != EXIT_SILENTLY) {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/MethodDescriptor.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/MethodDescriptor.java
index d95930af3031..6b0a9bb3cbda 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/MethodDescriptor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/MethodDescriptor.java
@@ -35,4 +35,8 @@ public interface MethodDescriptor<P extends ParameterInfo> {
   PsiElement getMethod();
 
   boolean canChangeVisibility();
+
+  boolean canChangeParameters();
+
+  boolean canChangeReturnType();
 }