Merge from V6_main_20120808 08Aug12

[modules/kernel.git] / src / SALOMEDSImpl / SALOMEDSImpl_AttributeUserID.cxx

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx
index 62a420b0ba8b7dba72fca63586c7fda47324f064..15a0051bc2a1bb0a8820902676f95c6aa19565ed 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeUserID.cxx
@@ -1,38 +1,41 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
+// License as published by the Free Software Foundation; either
 // version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : SALOMEDSImpl_AttributeUAttribute.cxx
 //  Author : Sergey RUIN
 //  Module : SALOME
-
-
+//
 #include "SALOMEDSImpl_AttributeUserID.hxx"
+#include "Basics_Utils.hxx"
 
-using namespace std;
-
-IMPLEMENT_STANDARD_HANDLE( SALOMEDSImpl_AttributeUserID, SALOMEDSImpl_GenericAttribute )
-IMPLEMENT_STANDARD_RTTIEXT( SALOMEDSImpl_AttributeUserID, SALOMEDSImpl_GenericAttribute )
+std::string SALOMEDSImpl_AttributeUserID::DefaultID()
+{
+  return Kernel_Utils::GetGUID(Kernel_Utils::DefUserID);
+}   
 
-Handle(SALOMEDSImpl_AttributeUserID) SALOMEDSImpl_AttributeUserID::Set (const TDF_Label& L, const Standard_GUID& ID) 
+SALOMEDSImpl_AttributeUserID* SALOMEDSImpl_AttributeUserID::Set (const DF_Label& L, const std::string& ID) 
 {
-  Handle(SALOMEDSImpl_AttributeUserID) A;
-  if (!L.FindAttribute(ID, A)) {
+  SALOMEDSImpl_AttributeUserID* A = NULL;
+  if (!(A=(SALOMEDSImpl_AttributeUserID*)L.FindAttribute(ID))) {
     A = new  SALOMEDSImpl_AttributeUserID(); 
     A->SetValue(ID);
     L.AddAttribute(A);
@@ -44,7 +47,7 @@ Handle(SALOMEDSImpl_AttributeUserID) SALOMEDSImpl_AttributeUserID::Set (const TD
 //function : ID
 //purpose  :
 //=======================================================================
-const Standard_GUID& SALOMEDSImpl_AttributeUserID::ID() const
+const std::string& SALOMEDSImpl_AttributeUserID::ID() const
 { return myID; }
 
 
@@ -52,7 +55,7 @@ const Standard_GUID& SALOMEDSImpl_AttributeUserID::ID() const
 //function : SetValue
 //purpose  :
 //=======================================================================
-void SALOMEDSImpl_AttributeUserID::SetValue( const Standard_GUID&  guid)
+void SALOMEDSImpl_AttributeUserID::SetValue( const std::string&  guid)
 {
   CheckLocked();
   if(myID == guid) return;
@@ -67,9 +70,9 @@ void SALOMEDSImpl_AttributeUserID::SetValue( const Standard_GUID&  guid)
 //function : NewEmpty
 //purpose  :
 //=======================================================================
-Handle(TDF_Attribute) SALOMEDSImpl_AttributeUserID::NewEmpty () const
+DF_Attribute* SALOMEDSImpl_AttributeUserID::NewEmpty () const
 {
-  Handle(SALOMEDSImpl_AttributeUserID) A = new SALOMEDSImpl_AttributeUserID();
+  SALOMEDSImpl_AttributeUserID* A = new SALOMEDSImpl_AttributeUserID();
   A->SetValue(myID);
   return A;
 }
@@ -78,9 +81,9 @@ Handle(TDF_Attribute) SALOMEDSImpl_AttributeUserID::NewEmpty () const
 //function : Restore
 //purpose  :
 //=======================================================================
-void SALOMEDSImpl_AttributeUserID::Restore(const Handle(TDF_Attribute)& with)
+void SALOMEDSImpl_AttributeUserID::Restore(DF_Attribute* with)
 {
-  Handle(SALOMEDSImpl_AttributeUserID) A = Handle(SALOMEDSImpl_AttributeUserID)::DownCast(with);
+  SALOMEDSImpl_AttributeUserID* A = dynamic_cast<SALOMEDSImpl_AttributeUserID*>(with);
   SetValue( A->ID() );
 }
 
@@ -88,22 +91,19 @@ void SALOMEDSImpl_AttributeUserID::Restore(const Handle(TDF_Attribute)& with)
 //function : Paste
 //purpose  :
 //=======================================================================
-void SALOMEDSImpl_AttributeUserID::Paste (const Handle(TDF_Attribute)& into,
-                                         const Handle(TDF_RelocationTable)& RT) const
+void SALOMEDSImpl_AttributeUserID::Paste (DF_Attribute* into)
 {
-  Handle(SALOMEDSImpl_AttributeUserID) A = Handle(SALOMEDSImpl_AttributeUserID)::DownCast(into);
+  SALOMEDSImpl_AttributeUserID* A = dynamic_cast<SALOMEDSImpl_AttributeUserID*>(into);
   A->SetValue( myID );
 }    
 
-TCollection_AsciiString SALOMEDSImpl_AttributeUserID::Type() 
+std::string SALOMEDSImpl_AttributeUserID::Type() 
 {
 
-  char* aUAttrName = new char[60];
-  char aGUID[40];
-  ID().ToCString(aGUID);
-  sprintf(aUAttrName, "AttributeUserID_%s",aGUID);
+  char* aUAttrName = new char[127];
+  sprintf(aUAttrName, "AttributeUserID_%s",ID().c_str());
 
-  TCollection_AsciiString ret(aUAttrName);
+  std::string ret(aUAttrName);
   delete aUAttrName;
 
   return ret;