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

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

diff --git a/src/Supervision/CNode_Impl.cxx b/src/Supervision/CNode_Impl.cxx
index 03bba4427503ebb14332ef822c5788435c131710..ac129a1204f8bca7f0bb4bba097cae110b842b37 100644 (file)
--- a/src/Supervision/CNode_Impl.cxx
+++ b/src/Supervision/CNode_Impl.cxx
@@ -197,7 +197,7 @@ bool CNode_Impl::Delete() {
     DeletePorts() ;
     RetVal = DataFlowEditor()->RemoveNode( Name() ) ;
     if ( RetVal ) {
-      RetVal = DataFlowEditor()->UnValid() ;
+      DataFlowEditor()->UnValid() ;
     }
   }
   endService( "CNode_Impl::Delete" );
@@ -609,7 +609,8 @@ SUPERV::Port_ptr CNode_Impl::Port( const char * ServiceParameterName ) {
         hasinput = DataFlowEditor()->HasInput( anInPort->PortName() ) ;
       }
       if ( hasinput ) {
-        const CORBA::Any * anAny = anInPort->GetOutPort()->Value() ;
+//JR 30.03.2005        const CORBA::Any * anAny = anInPort->GetOutPort()->Value() ;
+        const CORBA::Any anAny = anInPort->GetOutPort()->Value() ;
         myPort = new Port_Impl( _Orb , _Poa , _ContId ,
                                 instanceName() , interfaceName() ,
                                 DataFlowEditor() ,
@@ -617,7 +618,7 @@ SUPERV::Port_ptr CNode_Impl::Port( const char * ServiceParameterName ) {
 //                                ServiceParameterName ,
                                 (GraphBase::Port * ) anInPort ,
                                 true ,
-                                anAny ) ;
+                                &anAny ) ;
       }
       else {
         myPort = new Port_Impl( _Orb , _Poa , _ContId ,
@@ -653,7 +654,8 @@ SUPERV::Port_ptr CNode_Impl::Port( const char * ServiceParameterName ) {
         beginService( "CNode_Impl::Port" );
         begin = false ;
       }
-      const CORBA::Any * anAny = anOutPort->Value() ;
+//JR 30.03.2005      const CORBA::Any * anAny = anOutPort->Value() ;
+      const CORBA::Any anAny = anOutPort->Value() ;
       myPort = new Port_Impl( _Orb , _Poa , _ContId ,
                               instanceName() , interfaceName() ,
                               DataFlowEditor() ,
@@ -661,7 +663,7 @@ SUPERV::Port_ptr CNode_Impl::Port( const char * ServiceParameterName ) {
 //                              ServiceParameterName ,
                               (GraphBase::Port * ) anOutPort ,
                               false ,
-                              anAny ) ;
+                              &anAny ) ;
       PortableServer::ObjectId * id = myPort->getId() ;
       CORBA::Object_var obj = _poa->id_to_reference(*id);
       iobject = SUPERV::Port::_narrow(obj) ;
@@ -805,14 +807,15 @@ SUPERV::Port_ptr CNode_Impl::GetOutPort( const char *aParameterName ) {
   if ( anOutPort && !anOutPort->IsDataStream() ) {
     Outobject = anOutPort->ObjRef() ;
     if ( CORBA::is_nil( Outobject ) ) {
-      const CORBA::Any * anAny = anOutPort->Value() ;
+//JR 30.03.2005      const CORBA::Any * anAny = anOutPort->Value() ;
+      const CORBA::Any anAny = anOutPort->Value() ;
       myOutPort = new Port_Impl( _Orb , _Poa , _ContId ,
                                  instanceName() , interfaceName() ,
                                  DataFlowEditor() ,
                                  DataFlowNode() ,
                                  (GraphBase::Port * ) anOutPort ,
                                  false ,
-                                 anAny ) ;
+                                 &anAny ) ;
       if ( myOutPort ) {
         PortableServer::ObjectId * id = myOutPort->getId() ;
         CORBA::Object_var obj = _poa->id_to_reference(*id) ;
@@ -858,14 +861,15 @@ SUPERV::StreamPort_ptr CNode_Impl::GetOutStreamPort( const char *aParameterName
     if ( anOutPort && anOutPort->IsDataStream() ) {
       Outobject = SUPERV::StreamPort::_narrow( anOutPort->ObjRef() ) ;
       if ( CORBA::is_nil( Outobject ) ) {
-        const CORBA::Any * anAny = anOutPort->Value() ;
+//JR 30.03.2005        const CORBA::Any * anAny = anOutPort->Value() ;
+        const CORBA::Any anAny = anOutPort->Value() ;
         myOutStreamPort = new StreamPort_Impl( _Orb , _Poa , _ContId ,
                                  instanceName() , interfaceName() ,
                                  DataFlowEditor() ,
                                  DataFlowNode() ,
                                  (GraphBase::Port * ) anOutPort ,
                                  false ,
-                                 anAny ) ;
+                                 &anAny ) ;
         if ( myOutStreamPort ) {
           PortableServer::ObjectId * id = myOutStreamPort->getId() ;
           CORBA::Object_var obj = _poa->id_to_reference(*id) ;
@@ -1001,14 +1005,15 @@ SUPERV::ListOfPorts * CNode_Impl::Ports() {
 //                   << "/" << anInPort->IsNotConnected() ) ;
           Port_Impl * myPort ;
           if ( DataFlowNode()->HasInput( anInPort->PortName() ) ) {
-            const CORBA::Any * anAny = anInPort->GetOutPort()->Value() ;
+//JR 30.03.2005            const CORBA::Any * anAny = anInPort->GetOutPort()->Value() ;
+            const CORBA::Any anAny = anInPort->GetOutPort()->Value() ;
             myPort = new Port_Impl( _Orb , _Poa , _ContId ,
                                     instanceName() , interfaceName() ,
                                     DataFlowEditor() ,
                                     DataFlowNode() ,
                                     (GraphBase::Port * ) anInPort ,
                                     true ,
-                                    anAny ) ;
+                                    &anAny ) ;
           }
           else {
             myPort = new Port_Impl( _Orb , _Poa , _ContId ,
@@ -1051,14 +1056,15 @@ SUPERV::ListOfPorts * CNode_Impl::Ports() {
         }
         else if ( CORBA::is_nil( anOutPort->ObjRef() ) ) {
 //          MESSAGE( "OutPort " << i << " " << anOutPort->PortName() << " of Node " << Name() ) ;
-          const CORBA::Any * anAny = anOutPort->Value() ;
+//JR 30.03.2005          const CORBA::Any * anAny = anOutPort->Value() ;
+          const CORBA::Any anAny = anOutPort->Value() ;
           Port_Impl * myPort = new Port_Impl( _Orb , _Poa , _ContId ,
                                               instanceName() , interfaceName() ,
                                               DataFlowEditor() ,
                                               DataFlowNode() ,
                                               (GraphBase::Port * ) anOutPort ,
                                               false ,
-                                              anAny ) ;
+                                              &anAny ) ;
           PortableServer::ObjectId * id = myPort->getId() ;
           CORBA::Object_var obj = _poa->id_to_reference(*id);
           SUPERV::Port_var iobject ;
@@ -1095,14 +1101,15 @@ SUPERV::ListOfPorts * CNode_Impl::Ports() {
            }
             Port_Impl * myPort ;
             if ( anOutPort->IsDataConnected() ) {
-              const CORBA::Any * anAny = anOutPort->Value() ;
+//JR 30.03.2005              const CORBA::Any * anAny = anOutPort->Value() ;
+              const CORBA::Any anAny = anOutPort->Value() ;
               myPort = new Port_Impl( _Orb , _Poa , _ContId ,
                                       instanceName() , interfaceName() ,
                                       DataFlowEditor() ,
                                       DataFlowNode() ,
                                       (GraphBase::Port * ) anOutPort ,
                                       true ,
-                                      anAny ) ;
+                                      &anAny ) ;
             }
             else {
               myPort = new Port_Impl( _Orb , _Poa , _ContId ,
@@ -1141,14 +1148,15 @@ SUPERV::ListOfPorts * CNode_Impl::Ports() {
            }
             Port_Impl * myPort ;
             if ( anInPort->IsDataConnected() ) {
-              const CORBA::Any * anAny = anInPort->GetOutPort()->Value() ;
+//JR 30.03.2005              const CORBA::Any * anAny = anInPort->GetOutPort()->Value() ;
+              const CORBA::Any anAny = anInPort->GetOutPort()->Value() ;
               myPort = new Port_Impl( _Orb , _Poa , _ContId ,
                                       instanceName() , interfaceName() ,
                                       DataFlowEditor() ,
                                       DataFlowNode() ,
                                       (GraphBase::Port * ) anInPort ,
                                       false ,
-                                      anAny ) ;
+                                      &anAny ) ;
             }
             else {
               myPort = new Port_Impl( _Orb , _Poa , _ContId ,
@@ -1219,14 +1227,15 @@ SUPERV::ListOfStreamPorts * CNode_Impl::StreamPorts() {
                    << "/" << anInPort->IsNotConnected() ) ;
           StreamPort_Impl * myStreamPort ;
           if ( DataFlowNode()->HasInput( anInPort->PortName() ) ) {
-            const CORBA::Any * anAny = anInPort->GetOutPort()->Value() ;
+//JR 30.03.2005            const CORBA::Any * anAny = anInPort->GetOutPort()->Value() ;
+            const CORBA::Any anAny = anInPort->GetOutPort()->Value() ;
             myStreamPort = new StreamPort_Impl( _Orb , _Poa , _ContId ,
                                     instanceName() , interfaceName() ,
                                     DataFlowEditor() ,
                                     DataFlowNode() ,
                                     (GraphBase::Port * ) anInPort ,
                                     true ,
-                                    anAny ) ;
+                                    &anAny ) ;
           }
           else {
             myStreamPort = new StreamPort_Impl( _Orb , _Poa , _ContId ,
@@ -1270,14 +1279,15 @@ SUPERV::ListOfStreamPorts * CNode_Impl::StreamPorts() {
         }
         else if ( CORBA::is_nil( anOutPort->ObjRef() ) ) {
           MESSAGE( "OutStreamPort " << i << " " << anOutPort->PortName() << " of Node " << Name() ) ;
-          const CORBA::Any * anAny = anOutPort->Value() ;
+//JR 30.03.2005          const CORBA::Any * anAny = anOutPort->Value() ;
+          const CORBA::Any anAny = anOutPort->Value() ;
           StreamPort_Impl * myStreamPort = new StreamPort_Impl( _Orb , _Poa , _ContId ,
                                               instanceName() , interfaceName() ,
                                               DataFlowEditor() ,
                                               DataFlowNode() ,
                                               (GraphBase::Port * ) anOutPort ,
                                               false ,
-                                              anAny ) ;
+                                              &anAny ) ;
           PortableServer::ObjectId * id = myStreamPort->getId() ;
           CORBA::Object_var obj = _poa->id_to_reference(*id);
           SUPERV::StreamPort_var iobject ;
@@ -1313,14 +1323,15 @@ SUPERV::ListOfStreamPorts * CNode_Impl::StreamPorts() {
            }
             StreamPort_Impl * myStreamPort ;
             if ( anOutPort->IsDataConnected() ) {
-              const CORBA::Any * anAny = anOutPort->Value() ;
+//JR 30.03.2005              const CORBA::Any * anAny = anOutPort->Value() ;
+              const CORBA::Any anAny = anOutPort->Value() ;
               myStreamPort = new StreamPort_Impl( _Orb , _Poa , _ContId ,
                                       instanceName() , interfaceName() ,
                                       DataFlowEditor() ,
                                       DataFlowNode() ,
                                       (GraphBase::Port * ) anOutPort ,
                                       true ,
-                                      anAny ) ;
+                                      &anAny ) ;
             }
             else {
               myStreamPort = new StreamPort_Impl( _Orb , _Poa , _ContId ,
@@ -1360,14 +1371,15 @@ SUPERV::ListOfStreamPorts * CNode_Impl::StreamPorts() {
            }
             StreamPort_Impl * myStreamPort ;
             if ( anInPort->IsDataConnected() ) {
-              const CORBA::Any * anAny = anInPort->GetOutPort()->Value() ;
+//JR 30.03.2005              const CORBA::Any * anAny = anInPort->GetOutPort()->Value() ;
+              const CORBA::Any anAny = anInPort->GetOutPort()->Value() ;
               myStreamPort = new StreamPort_Impl( _Orb , _Poa , _ContId ,
                                       instanceName() , interfaceName() ,
                                       DataFlowEditor() ,
                                       DataFlowNode() ,
                                       (GraphBase::Port * ) anInPort ,
                                       false ,
-                                      anAny ) ;
+                                      &anAny ) ;
             }
             else {
               myStreamPort = new StreamPort_Impl( _Orb , _Poa , _ContId ,