-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2011 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 : SALOMEDS_SObject.hxx
// Author : Sergey RUIN
// Module : SALOME
-
+//
#include <string>
#include "SALOMEDS_SObject.hxx"
#include "Utils_ORB_INIT.hxx"
#include "Utils_SINGLETON.hxx"
+#include "Basics_Utils.hxx"
+
+#include "utilities.h"
+
#ifdef WIN32
#include <windows.h>
#include <process.h>
#include <unistd.h>
#endif
-#include "OpUtil.hxx"
-#include "utilities.h"
-
-using namespace std;
SALOMEDS_SObject::SALOMEDS_SObject(SALOMEDS::SObject_ptr theSObject)
{
#endif
CORBA::LongLong addr = // mpv: fix for IPAL13534: for 64-bit platforms use 8-bytes long for pointer storage
- theSObject->GetLocalImpl(GetHostname().c_str(), pid, _isLocal);
+ theSObject->GetLocalImpl(Kernel_Utils::GetHostname().c_str(), pid, _isLocal);
if(_isLocal) {
- _local_impl = ((SALOMEDSImpl_SObject*)(addr));
+ _local_impl = reinterpret_cast<SALOMEDSImpl_SObject*>(addr);
_corba_impl = SALOMEDS::SObject::_duplicate(theSObject);
}
else {
SALOMEDS_SObject::~SALOMEDS_SObject()
{
if (!_isLocal) {
- _corba_impl->Destroy();
+ _corba_impl->UnRegister();
}
else {
if(_local_impl) delete _local_impl;
}
}
+bool SALOMEDS_SObject::IsNull() const
+{
+ return _isLocal ? ( !_local_impl || _local_impl->IsNull() ) : _corba_impl->IsNull();
+}
+
std::string SALOMEDS_SObject::GetID()
{
std::string aValue;
SALOMEDS::Locker lock;
aValue = _local_impl->GetID();
}
- else aValue = _corba_impl->GetID();
+ else aValue = (CORBA::String_var)_corba_impl->GetID();
return aValue;
}
SALOMEDS::Locker lock;
return _PTR(SComponent)(new SALOMEDS_SComponent(_local_impl->GetFatherComponent()));
}
- return _PTR(SComponent)(new SALOMEDS_SComponent(_corba_impl->GetFatherComponent()));
+ return _PTR(SComponent)(new SALOMEDS_SComponent((SALOMEDS::SComponent_var)_corba_impl->GetFatherComponent()));
}
_PTR(SObject) SALOMEDS_SObject::GetFather()
SALOMEDS::Locker lock;
return _PTR(SObject)(new SALOMEDS_SObject(_local_impl->GetFather()));
}
- return _PTR(SObject)(new SALOMEDS_SObject(_corba_impl->GetFather()));
+ return _PTR(SObject)(new SALOMEDS_SObject((SALOMEDS::SObject_var)_corba_impl->GetFather()));
}
bool SALOMEDS_SObject::FindAttribute(_PTR(GenericAttribute)& anAttribute,
SALOMEDS::Locker lock;
return _PTR(Study)(new SALOMEDS_Study(_local_impl->GetStudy()));
}
- return _PTR(Study)(new SALOMEDS_Study(_corba_impl->GetStudy()));
+ SALOMEDS::Study_var study=_corba_impl->GetStudy();
+ return _PTR(Study)(new SALOMEDS_Study(study));
}
std::string SALOMEDS_SObject::Name()
SALOMEDS::Locker lock;
aName = _local_impl->Name();
}
- else aName = _corba_impl->Name();
+ else aName = (CORBA::String_var)_corba_impl->Name();
return aName;
}
else _corba_impl->Name(theName.c_str());
}
-vector<_PTR(GenericAttribute)> SALOMEDS_SObject::GetAllAttributes()
+std::vector<_PTR(GenericAttribute)> SALOMEDS_SObject::GetAllAttributes()
{
- vector<_PTR(GenericAttribute)> aVector;
+ std::vector<_PTR(GenericAttribute)> aVector;
int aLength = 0;
SALOMEDSClient_GenericAttribute* anAttr;
if (_isLocal) {
SALOMEDS::Locker lock;
- vector<DF_Attribute*> aSeq = _local_impl->GetAllAttributes();
+ std::vector<DF_Attribute*> aSeq = _local_impl->GetAllAttributes();
aLength = aSeq.size();
for (int i = 0; i < aLength; i++) {
anAttr = SALOMEDS_GenericAttribute::CreateAttribute(dynamic_cast<SALOMEDSImpl_GenericAttribute*>(aSeq[i]));
SALOMEDS::Locker lock;
aName = _local_impl->GetName();
}
- else aName = _corba_impl->GetName();
+ else aName = (CORBA::String_var) _corba_impl->GetName();
return aName;
}
SALOMEDS::Locker lock;
aComment = _local_impl->GetComment();
}
- else aComment = _corba_impl->GetComment();
+ else aComment = (CORBA::String_var) _corba_impl->GetComment();
return aComment;
}
SALOMEDS::Locker lock;
anIOR = _local_impl->GetIOR();
}
- else anIOR = _corba_impl->GetIOR();
+ else anIOR = (CORBA::String_var) _corba_impl->GetIOR();
return anIOR;
}
ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
_orb = init(0 , 0 ) ;
}
+
+void SALOMEDS_SObject::SetAttrString(const std::string& name, const std::string& value)
+{
+ if(_isLocal)
+ {
+ SALOMEDS::Locker lock;
+ _local_impl->SetAttrString(name,value);
+ }
+ else
+ {
+ _corba_impl->SetAttrString(name.c_str(),value.c_str());
+ }
+}
