Merge V9_dev branch into master

[samples/atomsolv.git] / src / ATOMSOLV / ATOMSOLV.cxx

diff --git a/src/ATOMSOLV/ATOMSOLV.cxx b/src/ATOMSOLV/ATOMSOLV.cxx
index b55c4e6c35e92f4adf12becf1777a6e0bd833e51..282d82aa36278135324c251e65a3800c6f4cf62f 100755 (executable)
--- a/src/ATOMSOLV/ATOMSOLV.cxx
+++ b/src/ATOMSOLV/ATOMSOLV.cxx
@@ -36,13 +36,14 @@ ATOMSOLV::ATOMSOLV(CORBA::ORB_ptr orb,
   MESSAGE("activate object");
   _thisObj = this ;
   _id = _poa->activate_object(_thisObj);
+  myData = new ATOMSOLV_ORB::TMoleculeList();
 }
 
 ATOMSOLV::~ATOMSOLV()
 {
 }
 
-CORBA::Boolean ATOMSOLV::setData( CORBA::Long studyID, const ATOMSOLV_ORB::TMoleculeList& theData )
+CORBA::Boolean ATOMSOLV::setData( const ATOMSOLV_ORB::TMoleculeList& theData )
 {
   const int n = theData.length();
   ATOMSOLV_ORB::TMoleculeList_var data = new ATOMSOLV_ORB::TMoleculeList();
@@ -50,37 +51,29 @@ CORBA::Boolean ATOMSOLV::setData( CORBA::Long studyID, const ATOMSOLV_ORB::TMole
   for ( int i = 0; i < n; i++ )
     data[ i ] = theData[ i ];
 
-  //  printf( " -- ATOMSOLV::setData( %d ) length = %d\n", studyID, data->length() );
-  myData[ studyID ] = data._retn();
+  //  printf( " -- ATOMSOLV::setData() length = %d\n", data->length() );
+  myData = data._retn();
 
   return (bool)n;
 }
 
-CORBA::Boolean ATOMSOLV::getData( CORBA::Long studyID, ATOMSOLV_ORB::TMoleculeList_out outData )
+CORBA::Boolean ATOMSOLV::getData( ATOMSOLV_ORB::TMoleculeList_out outData )
 {
-  if ( myData.find( studyID ) != myData.end() ) {
-    ATOMSOLV_ORB::TMoleculeList* data = myData[ studyID ];
-
-    //    printf( " -- ATOMSOLV::getData( %d ) length = %d\n", studyID, data->length() );
-    const int n = data->length();
-    outData = new ATOMSOLV_ORB::TMoleculeList();
-    outData->length( n );
-
-    for ( int i = 0; i < n; i++ )
-      (*outData)[ i ] = (*data)[ i ];
-    
-    return true;
-  }
-  return false;
+  ATOMSOLV_ORB::TMoleculeList* data = myData;
+  //    printf( " -- ATOMSOLV::getData() length = %d\n", data->length() );
+  const int n = data->length();
+  outData = new ATOMSOLV_ORB::TMoleculeList();
+  outData->length( n );
+  for ( int i = 0; i < n; i++ )
+    (*outData)[ i ] = (*data)[ i ];
+  return true;
 }
 
-CORBA::Boolean ATOMSOLV::processData( CORBA::Long studyID )
+CORBA::Boolean ATOMSOLV::processData()
 {
-  if ( myData.find( studyID ) != myData.end() ) {
-    ATOMSOLV_ORB::TMoleculeList* data = myData[ studyID ];
-    for ( int i = 0, n = data->length(); i < n; i++ )
-      (*data)[i].temperature = rand();
-  }
+  ATOMSOLV_ORB::TMoleculeList* data = myData;
+  for ( int i = 0, n = data->length(); i < n; i++ )
+    (*data)[i].temperature = rand();
   return true;
 }