From: jfa <jfa@opencascade.com>
Date: Fri, 28 Jul 2006 13:03:57 +0000 (+0000)
Subject: Roll back invalid integration.
X-Git-Tag: For_OCT_611~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2e73a128c98ec566823f2d8d39c983b5586844c7;p=modules%2Fkernel.git

Roll back invalid integration.
---

diff --git a/doc/salome/version.texi b/doc/salome/version.texi
index 7735c3f9f..b78723440 100644
--- a/doc/salome/version.texi
+++ b/doc/salome/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 2 June 2006
 @set UPDATED-MONTH June 2006
-@set EDITION 3.2.1
-@set VERSION 3.2.1
+@set EDITION 3.2.0
+@set VERSION 3.2.0
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
index bed8d6542..ed054fb2e 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
@@ -1527,27 +1527,16 @@ void SALOMEDSImpl_Study::Modify()
 //============================================================================
 Handle(SALOMEDSImpl_AttributeParameter) SALOMEDSImpl_Study::GetCommonParameters(const char* theID, int theSavePoint)
 {
-  if (theSavePoint < 0) return NULL;
+  if(theSavePoint < 0) return NULL;
   Handle(SALOMEDSImpl_StudyBuilder) builder = NewBuilder();
   Handle(SALOMEDSImpl_SObject) so = FindComponent((char*)theID);
-  if (so.IsNull()) so = builder->NewComponent((char*)theID); 
-
-  Handle(SALOMEDSImpl_AttributeParameter) attParam;
-  if (theSavePoint == 0) //Get an attribute that is placed on the component itself.
-    builder->FindAttribute(so, attParam, "AttributeParameter");
-  else { // Try to find SObject that contains attribute parameter ...
-    TDF_Label savePointLabel = so->GetLabel().FindChild( theSavePoint, /*create=*/0 );
-    if ( !savePointLabel.IsNull() ) {
-      so = GetSObject( savePointLabel );
-      builder->FindAttribute(so, attParam, "AttributeParameter");
-    } // ... if it does not exist - create a new one
-    else {
-      so = builder->NewObjectToTag( so, theSavePoint );
-      Handle(TDF_Attribute) att = builder->FindOrCreateAttribute(so, "AttributeParameter");
-      attParam = Handle(SALOMEDSImpl_AttributeParameter)::DownCast( att );
-    }
-  }
-  return attParam;
+  if(so.IsNull()) so = builder->NewComponent((char*)theID); 
+  Handle(SALOMEDSImpl_SObject) newSO;
+  if(theSavePoint == 0) //Get an attribute that is placed on the component itself.
+    newSO = so;
+  else
+    newSO = builder->NewObjectToTag(so, theSavePoint);
+  return Handle(SALOMEDSImpl_AttributeParameter)::DownCast(builder->FindOrCreateAttribute(newSO, "AttributeParameter"));
 }
 
 //============================================================================
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
index bf8215338..d47beb3dd 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.cxx
@@ -524,8 +524,7 @@ bool SALOMEDSImpl_StudyBuilder::FindAttribute(const Handle(SALOMEDSImpl_SObject)
   }
   TDF_Label Lab = anObject->GetLabel();
   if (Lab.FindAttribute(SALOMEDSImpl_SObject::GetGUID(aTypeOfAttribute), anAttribute)) {
-    // commented out because NO MODIFICATION is done to attributes when calling FindAttribute()
-    // _doc->Modify();  
+    _doc->Modify();  
     return Standard_True;
   }
   return Standard_False;