Revert "Synchronize adm files"

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

diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
index 6396ada74e12ca7840cdd9836a000887b5f0556d..5c4616066dd6a32ae49c6c34e5af6f17e725246f 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
@@ -1,53 +1,47 @@
-//  SALOME SALOMEDS : data structure of SALOME and sources of Salome data server 
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  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. 
-// 
-//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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
+// version 2.1 of the License, or (at your option) any later version.
 //
+// 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_ChildIterator_i.cxx
-//  Author : Yves FRICAUD
+//  Author : Sergey RUIN
 //  Module : SALOME
-//  $Header$
-
-#include <TDF_Tool.hxx>
-
+//
 #include "SALOMEDS_ChildIterator_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
+#include "SALOMEDS.hxx"
+#include "SALOMEDSImpl_SObject.hxx"
+#include "SALOMEDSImpl_Study.hxx"
 #include "utilities.h"
 
-using namespace std;
-
 //============================================================================
 /*! Function : constructor
  *  Purpose  :
  */
 //============================================================================
-SALOMEDS_ChildIterator_i::SALOMEDS_ChildIterator_i(SALOMEDS_Study_i* theStudy,
-                                                  const TDF_Label& theLabel,
-                                                  bool theIsAllLevels): 
-  _it(theLabel,theIsAllLevels),
-  _lab(theLabel),
-  _study(theStudy)
+SALOMEDS_ChildIterator_i::SALOMEDS_ChildIterator_i(const SALOMEDSImpl_ChildIterator& theImpl,
+                                                   CORBA::ORB_ptr orb) 
+  : _it(theImpl.GetPersistentCopy())
 {
-  TCollection_AsciiString anEntry;
-  TDF_Tool::Entry(theLabel,anEntry);
+  SALOMEDS::Locker lock;
+  _orb = CORBA::ORB::_duplicate(orb);
 }
 
 //============================================================================
@@ -57,6 +51,7 @@ SALOMEDS_ChildIterator_i::SALOMEDS_ChildIterator_i(SALOMEDS_Study_i* theStudy,
 //============================================================================
 SALOMEDS_ChildIterator_i::~SALOMEDS_ChildIterator_i()
 {
+    if(_it) delete _it;
 }
 
 //============================================================================
@@ -66,7 +61,8 @@ SALOMEDS_ChildIterator_i::~SALOMEDS_ChildIterator_i()
 //============================================================================
 void SALOMEDS_ChildIterator_i::Init()
 { 
-  _it.Initialize (_lab);
+  SALOMEDS::Locker lock;
+  _it->Init();
 }
 
 //============================================================================
@@ -76,7 +72,8 @@ void SALOMEDS_ChildIterator_i::Init()
 //============================================================================
 void SALOMEDS_ChildIterator_i::InitEx(CORBA::Boolean allLevels)
 { 
-  _it.Initialize (_lab, allLevels);
+  SALOMEDS::Locker lock;
+  _it->InitEx (allLevels);
 }
 
 //============================================================================
@@ -86,7 +83,8 @@ void SALOMEDS_ChildIterator_i::InitEx(CORBA::Boolean allLevels)
 //============================================================================
 CORBA::Boolean SALOMEDS_ChildIterator_i::More()
 {
-  return _it.More();
+  SALOMEDS::Locker lock;
+  return _it->More();
 }
 
  //============================================================================
@@ -96,20 +94,22 @@ CORBA::Boolean SALOMEDS_ChildIterator_i::More()
 //============================================================================
 void SALOMEDS_ChildIterator_i::Next()
 {
-  _it.Next();
-  TCollection_AsciiString anEntry;
-  TDF_Tool::Entry(_it.Value(),anEntry);
+  SALOMEDS::Locker lock;
+  _it->Next();
 }
 
 
 //============================================================================
-/*! Function :
+/*! Function : Value
  *  Purpose  :
  */
 //============================================================================
 
 SALOMEDS::SObject_ptr SALOMEDS_ChildIterator_i::Value()
 {
-  return SALOMEDS_SObject_i::NewRef(_study,_it.Value())._retn();
+  SALOMEDS::Locker lock;
+  SALOMEDSImpl_SObject aSO = _it->Value();
+  SALOMEDS::SObject_var so = SALOMEDS_SObject_i::New (aSO, _orb);
+  return so._retn();
 }