From 3184ebb3d8cff3ebc3108a6489c7df8bb5136b2d Mon Sep 17 00:00:00 2001
From: spo <sergey.pokhodenko@opencascade.com>
Date: Mon, 6 Jul 2015 11:52:46 +0300
Subject: [PATCH] Issue #588: Renaming a parameter used in an expression

---
 .../ParametersPlugin_EvalListener.cpp         | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp b/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp
index 96e280436..c32723cfb 100644
--- a/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp
+++ b/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp
@@ -296,29 +296,6 @@ void ParametersPlugin_EvalListener::processObjectRenamedEvent(
     aDocList.push_back(aRootDocument);
   }
 
-  // Find parameters and rename in its expressions
-  for (std::list<DocumentPtr>::const_iterator aDicumentIt = aDocList.begin(); 
-       aDicumentIt != aDocList.end(); ++aDicumentIt) {
-    const DocumentPtr& aDocument = *aDicumentIt;
-    const int aSize = aDocument->size(ModelAPI_ResultParameter::group());
-    for (int anIndex = 0; anIndex < aSize; ++anIndex) {
-      ResultParameterPtr aResultParameter =
-          std::dynamic_pointer_cast<ModelAPI_ResultParameter>(
-              aDocument->object(ModelAPI_ResultParameter::group(), anIndex));
-      if (!aResultParameter.get())
-        continue;
-
-      std::shared_ptr<ParametersPlugin_Parameter> aParameter =
-          std::dynamic_pointer_cast<ParametersPlugin_Parameter>(
-              aDocument->feature(aResultParameter));
-      if (!aParameter.get())
-        continue;
-
-      // Rename
-      renameInParameter(aParameter, aMessage->oldName(), aMessage->newName());
-    }
-  }
-
   // Find all features
   for (std::list<DocumentPtr>::const_iterator aDicumentIt = aDocList.begin(); 
        aDicumentIt != aDocList.end(); ++aDicumentIt) {
@@ -328,6 +305,15 @@ void ParametersPlugin_EvalListener::processObjectRenamedEvent(
     for (; aFeatureIt != aFeatures.end(); ++aFeatureIt) {
       const FeaturePtr& aFeature = *aFeatureIt;
       
+      // If Parameter feature then rename its expression
+      std::shared_ptr<ParametersPlugin_Parameter> aParameter =
+          std::dynamic_pointer_cast<ParametersPlugin_Parameter>(aFeature);
+      if (aParameter.get()) {
+        // Rename
+        renameInParameter(aParameter, aMessage->oldName(), aMessage->newName());
+        continue;
+      }      
+
       // Find all attributes
       std::list<AttributePtr> anAttributes = aFeature->data()->attributes(std::string());
       std::list<AttributePtr>::const_iterator anAttributeIt = anAttributes.begin();
-- 
2.39.2