Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/superv.git] / src / Supervision / GNode_Impl.cxx

diff --git a/src/Supervision/GNode_Impl.cxx b/src/Supervision/GNode_Impl.cxx
index 7c770df016e972f22cab5d17fc83cabd6aec15ca..bc12026c729cf8bef3bbfbe3d22237167579eb41 100644 (file)
--- a/src/Supervision/GNode_Impl.cxx
+++ b/src/Supervision/GNode_Impl.cxx
@@ -1,13 +1,27 @@
 //  SUPERV Supervision : contains the implementation of interfaces of SuperVision described in SUPERV.idl
 //
-//  Copyright (C) 2003  CEA/DEN, EDF R&D
-//
-//
+//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : GNode_Impl.cxx
 //  Author : Jean Rahuel
 //  Module : SUPERV
-//  $Header: 
 
 using namespace std;
 #include <stdio.h>
@@ -140,9 +154,9 @@ void GNode_Impl::destroy() {
   if ( DataFlowEditor()->IsEditing() ) {
     if ( Delete() ) {
       _poa->deactivate_object(*_id) ;
-      CORBA::release(_poa) ;
+//      CORBA::release(_poa) ;
       delete(_id) ;
-      _thisObj->_remove_ref();
+//      _thisObj->_remove_ref();
     }
     else {
       MESSAGE("GNode_Impl::destroy ERROR ") ;
@@ -170,7 +184,7 @@ bool GNode_Impl::Delete() {
     DeletePorts() ;
     RetVal = DataFlowEditor()->RemoveNode( Name() ) ;
     if ( RetVal )
-      RetVal = DataFlowEditor()->IsValid() ;
+      DataFlowEditor()->UnValid() ;
   }
   endService( "GNode_Impl::Delete" );
   return RetVal ;
@@ -233,7 +247,8 @@ bool GNode_Impl::SetCoupled( const char * anInLineNode )
        ( !IsGOTO() && ( IsLoop() || IsSwitch() || IsEndLoop() || IsEndSwitch() ) ) ) {
     DataFlowNode()->CoupledNode( CoupledINode ) ;
     if ( CoupledINode && IsSwitch() ) {
-      DataFlowEditor()->AddLink( Name() , "Default" ,CoupledINode->Name() , "Default" ) ;
+//JR NPAL14793 05.02.2007 : do not add that link
+//      DataFlowEditor()->AddLink( Name() , "Default" ,CoupledINode->Name() , "Default" ) ;
     }
     else if ( CoupledINode && ( IsLoop() || IsEndLoop() ) ) {
       DataFlowEditor()->AddLink( Name() , "DoLoop" , CoupledINode->Name() , "DoLoop" ) ;