DCQ : Merge with Ecole_Ete_a6.

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

diff --git a/src/Supervision/Value_Impl.cxx b/src/Supervision/Value_Impl.cxx
index 954434827ff73c1f83293d4ea69c204276e33e2e..95a89a1971aeaf0887da8ae761d7319bec5bc124 100644 (file)
--- a/src/Supervision/Value_Impl.cxx
+++ b/src/Supervision/Value_Impl.cxx
@@ -143,7 +143,7 @@ CORBA::Any * Value_Impl::ToAny() {
       name = _DataFlowNode->Name() ;
     }
     else {
-      name = _DataFlowEditor->Name() ;
+      name = _DataFlowEditor->Graph()->Name() ;
     }
     if ( _InputPort ) {
       if ( _DataFlowNode ) {
@@ -191,7 +191,7 @@ CORBA::Any * Value_Impl::ToAny() {
 }
 
 char * Value_Impl::ToString() {
-  beginService( "Value_Impl::ToString" );
+//  beginService( "Value_Impl::ToString" );
   CORBA::Any anAny = *ToAny() ;
 //  cout << "Value_Impl::ToString " << _DataFlowNode->Name() << " "
 //       << _ParameterName << " " ;
@@ -201,7 +201,7 @@ char * Value_Impl::ToString() {
       name = _DataFlowNode->Name() ;
     }
     else {
-      name = _DataFlowEditor->Name() ;
+      name = _DataFlowEditor->Graph()->Name() ;
     }
     if ( _InputPort ) {
       if ( _DataFlowNode ) {
@@ -242,7 +242,7 @@ char * Value_Impl::ToString() {
   switch (anAny.type()->kind()) {
     case CORBA::tk_string: {
       anAny >>= retstr;
-      MESSAGE( "ToString( string ) '" << retstr << "'" );
+//      MESSAGE( "ToString( string ) '" << retstr << "'" );
       break ;
     }
     case CORBA::tk_long: {
@@ -250,7 +250,7 @@ char * Value_Impl::ToString() {
       anAny >>= l;
       astr << l << ends ;
       retstr = astr.str().c_str() ;
-      MESSAGE( "ToString( long ) '" << l << " " << retstr << "'" );
+//      MESSAGE( "ToString( long ) '" << l << " " << retstr << "'" );
       break ;
     }
     case CORBA::tk_double: {
@@ -262,7 +262,7 @@ char * Value_Impl::ToString() {
       while ( i < (int ) strlen( retstr ) && retstr[ i++ ] == ' ' ) {
         startstr = i ;
       }
-      MESSAGE( "ToString( double ) '" << d << "' '" << retstr << "' '" << &retstr[ startstr ] << "'");
+//      MESSAGE( "ToString( double ) '" << d << "' '" << retstr << "' '" << &retstr[ startstr ] << "'");
       break ;
     }
     case CORBA::tk_objref: {
@@ -270,7 +270,7 @@ char * Value_Impl::ToString() {
       try {
         anAny >>= obj ;
         retstr = _Orb->object_to_string( obj );
-        MESSAGE( "ToString( object ) '" << retstr << "'" );
+//        MESSAGE( "ToString( object ) '" << retstr << "'" );
       }
       catch ( ... ) {
         retstr = "object_to_string catched " ;
@@ -283,7 +283,7 @@ char * Value_Impl::ToString() {
       break ;
     }
   }
-  endService( "Value_Impl::ToString" );
+//  endService( "Value_Impl::ToString" );
   return CORBA::string_dup( &retstr[ startstr ] ) ;
 }
 
@@ -295,7 +295,7 @@ bool Value_Impl::IsIOR() {
       name = _DataFlowNode->Name() ;
     }
     else {
-      name = _DataFlowEditor->Name() ;
+      name = _DataFlowEditor->Graph()->Name() ;
     }
     if ( _InputPort ) {
       if ( _DataFlowNode ) {
@@ -335,7 +335,7 @@ bool Value_Impl::IsIOR() {
 
 char* Value_Impl::ComponentDataType() {
   GraphExecutor::DataFlow* _DataFlowExecutor = _DataFlowEditor->Executor();
-  const GraphBase::ComputingNode* node = _DataFlowExecutor->GetGraphNode(_DataFlowNode->Name());
+  const GraphBase::ComputingNode* node = _DataFlowExecutor->Graph()->GetGraphNode(_DataFlowNode->Name());
   if ( node->IsFactoryNode() ) {
     Engines::Component_var compo = ((GraphBase::FactoryNode * ) node )->Component();
     if ( CORBA::is_nil( compo ) ) {