From 83e19911839d219cc7e8fce3ad39cc07ecaae691 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 12 Jul 2012 12:56:39 +0200
Subject: [PATCH] IDEA-82043: change signature detection: ignore changes in
 annotations

---
 .../changeSignature/DetectedJavaChangeInfo.java            | 7 +++++++
 .../refactoring/changeSignature/ParameterInfoImpl.java     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/DetectedJavaChangeInfo.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/DetectedJavaChangeInfo.java
index a2093af6fa23..e1ad62fa1868 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/DetectedJavaChangeInfo.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/DetectedJavaChangeInfo.java
@@ -155,6 +155,13 @@ class DetectedJavaChangeInfo extends JavaChangeInfoImpl {
                   isReturnTypeChanged = true;
                 }
               }
+
+              for (int i = 0, length = Math.min(newParms.length, oldParameterNames.length); i < length; i++) {
+                ParameterInfoImpl parm = newParms[i];
+                if (parm.getName().equals(oldParameterNames[i]) && parm.getTypeText().equals(oldParameterTypes[i])) {
+                  parm.oldParameterIndex = i;
+                }
+              }
             }
           };
         javaChangeInfo.setSuperMethod(getSuperMethod());
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java
index f9525294e772..872dfcafc0d8 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java
@@ -33,7 +33,7 @@ import java.util.List;
 
 public class ParameterInfoImpl implements JavaParameterInfo {
   private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeSignature.ParameterInfoImpl");
-  public final int oldParameterIndex;
+  public int oldParameterIndex;
   boolean useAnySingleVariable;
   private String name = "";
   public static final ParameterInfoImpl[] EMPTY_ARRAY = new ParameterInfoImpl[0];