From ea7151ca6434edf7c785dccc8806ea81b586e062 Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <Denis.Zhdanov@jetbrains.com>
Date: Tue, 28 Aug 2012 16:13:18 +0400
Subject: [PATCH] IDEA-19061 Integrate the Rearranger-plugin into core-IDEA

Update model rows on changes
---
 .../arrangement/ArrangementRuleEditingModelImpl.java          | 4 ++++
 .../options/codeStyle/arrangement/ArrangementRuleTree.java    | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelImpl.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelImpl.java
index 9d28aafc83e3..261fb6f02e58 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelImpl.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelImpl.java
@@ -112,6 +112,10 @@ public class ArrangementRuleEditingModelImpl implements ArrangementRuleEditingMo
     return myRow;
   }
 
+  public void setRow(int row) {
+    myRow = row;
+  }
+
   @NotNull
   public ArrangementTreeNode getTopMost() {
     return myTopMost;
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java
index a1dfd129ad7d..c85a9275d5ac 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java
@@ -508,11 +508,10 @@ public class ArrangementRuleTree {
         ArrangementRuleEditingModelImpl m = myModels.remove(oldRow);
         if (m != null) {
           changedModelMappings.put(newRow, m);
+          m.setRow(newRow);
         }
         return true;
       }
-
-      
     });
     putAll(changedModelMappings, myModels);