SMH: 3.0.0 preparation = merged version (POLYWORK + RTVDEBUG01) + adopation for new GUI

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

diff --git a/src/Supervision/LNode_Impl.cxx b/src/Supervision/LNode_Impl.cxx
index 5e20dd8e04157f7dd7b0ec2c56fdf4d1d6949542..00d18232c43c44682c245248a4767abbf9c7cea4 100644 (file)
--- a/src/Supervision/LNode_Impl.cxx
+++ b/src/Supervision/LNode_Impl.cxx
@@ -86,22 +86,29 @@ void LNode_Impl::destroy() {
       delete(_id) ;
       _thisObj->_remove_ref();
     }
+    else {
+      MESSAGE("LNode_Impl::destroy ERROR ") ;
+    }
     if ( !CORBA::is_nil( aCoupled ) ) {
-      aCoupled->SetCoupled( "" ) ;
+//      aCoupled->SetCoupled( "" ) ; : Used in GraphBase::Graph::RemoveNode( EndLoopNode ) :
       aCoupled->destroy() ;
     }
+// Valid() only after deletion of the corresponding EndLoopNode :
+    DataFlowEditor()->UnValid() ;
   }
-//  endService( "LNode_Impl::Destroy" );
+  endService( "LNode_Impl::Destroy" );
 }
 
 bool LNode_Impl::Delete() {
   beginService( "LNode_Impl::Delete" );
-  bool RetVal = false ;
+  bool RetVal = false ;  
   if ( DataFlowEditor()->IsEditing() ) {
+    DeletePorts() ;
     RetVal = DataFlowEditor()->RemoveNode( Name() ) ;
-    if ( RetVal ) {
-      RetVal = DataFlowEditor()->IsValid() ;
-    }
+// Valid() only after deletion of the corresponding EndLoopNode :
+//    if ( RetVal ) {
+//      RetVal = DataFlowEditor()->IsValid() ;
+//    }
   }
   endService( "LNode_Impl::Delete" );
   return RetVal ;