Issue 0013373: EDF PAL 273 : Option Single/Multi file dump

[modules/kernel.git] / src / SALOMEDS / SALOMEDS_GenericAttribute.cxx

diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx b/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
index 0e338f3b192a59a4b9f81f21544e618733966a74..f209f0242d76dc11cdaece2de921961c20f2753a 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
@@ -1,30 +1,30 @@
-// Copyright (C) 2005  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 
-// 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 
-// Lesser General Public License for more details.
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/
+//  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
+//  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
+//  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
+//  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   : SALOMEDS_GenericAttribute.cxx
 //  Author : Sergey RUIN
 //  Module : SALOME
-
-
-
+//
 #include <string>
-#include <TCollection_AsciiString.hxx> 
 
 #include "SALOMEDS_GenericAttribute.hxx"
 #include "SALOMEDSImpl_SObject.hxx"
@@ -32,6 +32,8 @@
 #include "SALOMEDS_ClientAttributes.hxx"
 #include "SALOMEDS.hxx"
 
+#include "Basics_Utils.hxx"
+
 #ifdef WIN32
 #include <process.h>
 #else
@@ -39,11 +41,7 @@
 #include <unistd.h>
 #endif
 
-#include "OpUtil.hxx"
-
-using namespace std; 
-
-SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(const Handle(SALOMEDSImpl_GenericAttribute)& theGA)
+SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(SALOMEDSImpl_GenericAttribute* theGA)
 {
   _isLocal = true;
   _local_impl = theGA;
@@ -58,9 +56,9 @@ SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(SALOMEDS::GenericAttribute_
   long pid =  (long)getpid();
 #endif  
 
-  long addr = theGA->GetLocalImpl(GetHostname().c_str(), pid, _isLocal);
+  CORBA::LongLong addr = theGA->GetLocalImpl(Kernel_Utils::GetHostname().c_str(), pid, _isLocal);
   if(_isLocal) {
-    _local_impl = ((SALOMEDSImpl_GenericAttribute*)(addr));
+    _local_impl = reinterpret_cast<SALOMEDSImpl_GenericAttribute*>(addr);
     _corba_impl = SALOMEDS::GenericAttribute::_nil();
   }
   else {
@@ -72,7 +70,7 @@ SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(SALOMEDS::GenericAttribute_
 SALOMEDS_GenericAttribute::~SALOMEDS_GenericAttribute() 
 {
   if (!_isLocal) {
-    _corba_impl->Destroy();
+    _corba_impl->UnRegister();
   }
 }
 
@@ -97,10 +95,10 @@ std::string SALOMEDS_GenericAttribute::Type()
   std::string aType;
   if (_isLocal) {
     SALOMEDS::Locker lock;
-    aType = _local_impl->Type().ToCString();
+    aType = _local_impl->Type();
   }
   else {
-    aType = _corba_impl->Type();
+    aType = (CORBA::String_var)_corba_impl->Type();
   }
   return aType;
 }
@@ -110,10 +108,10 @@ std::string SALOMEDS_GenericAttribute::GetClassType()
   std::string aType;
   if (_isLocal) {
     SALOMEDS::Locker lock;
-    aType = _local_impl->GetClassType().ToCString();
+    aType = _local_impl->GetClassType();
   }
   else {
-    aType = _corba_impl->GetClassType();
+    aType = (CORBA::String_var)_corba_impl->GetClassType();
   }
   return aType;
 }
@@ -126,28 +124,32 @@ _PTR(SObject) SALOMEDS_GenericAttribute::GetSObject()
     aSO = new SALOMEDS_SObject(_local_impl->GetSObject());
   }
   else {
-    aSO = new SALOMEDS_SObject(_corba_impl->GetSObject());
+    aSO = new SALOMEDS_SObject((SALOMEDS::SObject_var)_corba_impl->GetSObject());
   }
 
   return _PTR(SObject)(aSO);
 }
 
 
-SALOMEDS_GenericAttribute* SALOMEDS_GenericAttribute::CreateAttribute
-                           (const Handle(SALOMEDSImpl_GenericAttribute)& theGA)
+SALOMEDS_GenericAttribute* SALOMEDS_GenericAttribute::CreateAttribute(SALOMEDSImpl_GenericAttribute* theGA)
 {
   SALOMEDS::Locker lock;
 
   SALOMEDS_GenericAttribute* aGA = NULL;
-  std::string aTypeOfAttribute = theGA->GetClassType().ToCString();
-  __CreateGenericClientAttributeLocal
+  if(theGA) {
+     std::string aTypeOfAttribute = theGA->GetClassType();
+      __CreateGenericClientAttributeLocal
+  }
   return aGA;
 }
 
 SALOMEDS_GenericAttribute* SALOMEDS_GenericAttribute::CreateAttribute(SALOMEDS::GenericAttribute_ptr theGA)
 {
   SALOMEDS_GenericAttribute* aGA = NULL;
-  std::string aTypeOfAttribute = theGA->GetClassType();
-  __CreateGenericClientAttributeCORBA
+  if(!CORBA::is_nil(theGA)) {
+      CORBA::String_var astr=theGA->GetClassType();
+      std::string aTypeOfAttribute = astr.in();
+      __CreateGenericClientAttributeCORBA
+  }
   return aGA;
 }