NRI : Merge delta [V1_2, V1_2c].

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

diff --git a/src/Supervision/FNode_Impl.cxx b/src/Supervision/FNode_Impl.cxx
index 130ecad41bbb44ebee0596cf1293ea2fe3dc64e6..49e6e5cd84257dedb0315da871425c8cddf08bf0 100644 (file)
--- a/src/Supervision/FNode_Impl.cxx
+++ b/src/Supervision/FNode_Impl.cxx
@@ -12,10 +12,10 @@
 using namespace std;
 #include <stdio.h>
 #include <fstream>
-#include <strstream>
+//#include <sstream>
 #include <string>
 
-#include "utilities.h"
+//#include "utilities.h"
 
 #include "FNode_Impl.hxx"
 
@@ -23,20 +23,21 @@ FNode_Impl::FNode_Impl() {
 }
 
 FNode_Impl::FNode_Impl( CORBA::ORB_ptr orb ,
-                     PortableServer::POA_ptr poa ,
-                     PortableServer::ObjectId * contId , 
-                     const char *instanceName ,
-                      const char *interfaceName ,
-                      GraphEditor::DataFlow * aDataFlowEditor ,
-                      const SALOME_ModuleCatalog::Service &NodeService ,
-                      const char * NodeComponentName ,
-                      const char * NodeInterfaceName ,
-                      const char * NodeName ,
-                      const SUPERV::KindOfNode NodeKindOfNode ) :
+                       PortableServer::POA_ptr poa ,
+                       PortableServer::ObjectId * contId , 
+                       const char * instanceName ,
+                        const char * interfaceName ,
+                        GraphEditor::DataFlow * aDataFlowEditor ,
+                        const SALOME_ModuleCatalog::Service &NodeService ,
+                        const char * NodeComponentName ,
+                        const char * NodeInterfaceName ,
+                        const char * NodeName ,
+                        const SUPERV::KindOfNode NodeKindOfNode ) :
 //  Engines_Component_i(orb, poa, contId, instanceName, interfaceName, false, false) {
-  CNode_Impl( orb , poa , contId , instanceName , interfaceName , aDataFlowEditor , NodeService , NodeName , NodeKindOfNode , (char * ) NULL ) {
-  MESSAGE( NodeName << " " );
-//  beginService( "FNode_Impl::FNode_Impl" );
+  CNode_Impl( orb , poa , contId , instanceName , interfaceName , aDataFlowEditor , NodeService , NodeName , NodeKindOfNode , NULLSTRING ) {
+//  MESSAGE( NodeName << " " );
+  beginService( "FNode_Impl::FNode_Impl" );
+//  cout << "FNode_Impl::FNode_Impl -->" << endl ;
   _thisObj = this ;
   _id = _poa->activate_object(_thisObj);
   _Orb = CORBA::ORB::_duplicate(orb);
@@ -47,16 +48,17 @@ FNode_Impl::FNode_Impl( CORBA::ORB_ptr orb ,
 //                                           NodeKindOfNode ) ) ;
   DataFlowNode()->ComponentName( NodeComponentName ) ;
   DataFlowNode()->InterfaceName( NodeInterfaceName ) ;
-//  endService( "FNode_Impl::FNode_Impl" );  
+  endService( "FNode_Impl::FNode_Impl" );  
+//  cout << "<-- FNode_Impl::FNode_Impl" << endl ;
 }
 
 FNode_Impl::FNode_Impl( CORBA::ORB_ptr orb ,
-                     PortableServer::POA_ptr poa ,
-                     PortableServer::ObjectId * contId , 
-                     const char *instanceName ,
-                      const char *interfaceName ,
-                      GraphEditor::DataFlow * aDataFlowEditor ,
-                      GraphEditor::InNode * aDataFlowNode ) :
+                       PortableServer::POA_ptr poa ,
+                       PortableServer::ObjectId * contId , 
+                       const char * instanceName ,
+                        const char * interfaceName ,
+                        GraphEditor::DataFlow * aDataFlowEditor ,
+                        GraphEditor::InNode * aDataFlowNode ) :
 //  Engines_Component_i(orb, poa, contId, instanceName, interfaceName, false, false) {
   CNode_Impl( orb , poa , contId , instanceName , interfaceName , aDataFlowEditor , aDataFlowNode ) {
   MESSAGE( DataFlowNode()->Name() << " " );