Merge from branch CCRT_Port_V220.

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

diff --git a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx
index f757e29006e5462cec495f5d6d4c0a308c980af8..61d750cd13f8e435d1af69f877d9540729fe3023 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx
@@ -1,15 +1,36 @@
-using namespace std;
-//  File      : SALOMEDS_SComponentIterator_i.cxx
-//  Created   : Wed Nov 28 16:23:49 2001
-//  Author    : Yves FRICAUD
-
-//  Project   : SALOME
-//  Module    : SALOMEDS
-//  Copyright : Open CASCADE 2001
+//  SALOME SALOMEDS : data structure of SALOME and sources of Salome data server 
+//
+//  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 
+//
+//
+//
+//  File   : SALOMEDS_SComponentIterator_i.cxx
+//  Author : Yves FRICAUD
+//  Module : SALOME
 //  $Header$
 
 #include "SALOMEDS_SComponentIterator_i.hxx"
+#include "SALOMEDS_SComponent_i.hxx"
+#include "SALOMEDS.hxx"
 
+using namespace std;
 
 //============================================================================
 /*! Function : constructor
@@ -17,12 +38,12 @@ using namespace std;
  */
 //============================================================================
 
-SALOMEDS_SComponentIterator_i::SALOMEDS_SComponentIterator_i(const Handle(TDocStd_Document) aDoc, 
-                                                            CORBA::ORB_ptr orb) 
+SALOMEDS_SComponentIterator_i::SALOMEDS_SComponentIterator_i(SALOMEDS_Study_i* theStudy,
+                                                            const Handle(TDocStd_Document)& theDocument): 
+  _it(theDocument->Main()),
+  _lab(theDocument->Main()),
+  _study(theStudy)
 {
-  _orb = CORBA::ORB::_duplicate(orb);
-  _lab = aDoc->Main();
-  _it.Initialize (_lab);
 }
 
 //============================================================================
@@ -41,6 +62,8 @@ SALOMEDS_SComponentIterator_i::~SALOMEDS_SComponentIterator_i()
 //============================================================================
 void SALOMEDS_SComponentIterator_i::Init()
 { 
+  SALOMEDS::Locker lock;
+
   _it.Initialize (_lab);
 }
 
@@ -51,6 +74,8 @@ void SALOMEDS_SComponentIterator_i::Init()
 //============================================================================
 CORBA::Boolean SALOMEDS_SComponentIterator_i::More()
 {
+  SALOMEDS::Locker lock;
+
   if (!_it.More())
     return false;
   TDF_Label L = _it.Value();
@@ -66,6 +91,8 @@ CORBA::Boolean SALOMEDS_SComponentIterator_i::More()
 //============================================================================
 void SALOMEDS_SComponentIterator_i::Next()
 {
+  SALOMEDS::Locker lock;
+
   _it.Next();
 }
 
@@ -77,8 +104,8 @@ void SALOMEDS_SComponentIterator_i::Next()
 //============================================================================
 SALOMEDS::SComponent_ptr SALOMEDS_SComponentIterator_i::Value()
 {
-  SALOMEDS_SComponent_i *  so_servant = new SALOMEDS_SComponent_i (_it.Value(),_orb);
-  SALOMEDS::SComponent_var so  = SALOMEDS::SComponent::_narrow(so_servant->SComponent::_this());   //pb d'heritage??
-  return so;
+  SALOMEDS::Locker lock;
+
+  return SALOMEDS_SComponent_i::NewRef(_study,_it.Value())._retn();
 }