Fri Oct 22 11:36:48 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp:
          Regenerated with -Gex -Gexr and added user code again

3 files changed, 95 insertions, 36 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 19251acfd92..a8dbcd6467a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 22 11:36:48 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h:
+        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp:
+          Regenerated with -Gex -Gexr and added user code again
+
 Fri Oct 22 11:39:15 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_MyFoo_objA_conn_i.h:
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
index cea241a46f9..b67f4876a1d 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp
@@ -2,11 +2,11 @@
 // $Id$
 
 #include "LOBO_Test_Sender_exec.h"
+#include "tao/ORB_Core.h"
+#include "ace/Reactor.h"
 #include "ace/Guard_T.h"
 #include "ace/Log_Msg.h"
 #include "ace/Date_Time.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
 
 namespace CIAO_LOBO_Test_Sender_Impl
 {
@@ -29,15 +29,17 @@ namespace CIAO_LOBO_Test_Sender_Impl
   //============================================================
   // Component Executor Implementation Class: Sender_exec_i
   //============================================================
+
   Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (10),
-      keys_ (5)
+    : keys_ (5)
+      , iterations_ (10)
   {
     this->ticker_ = new WriteTicker (*this);
   }
 
   Sender_exec_i::~Sender_exec_i (void)
   {
+    delete this->ticker_;
   }
 
   void
@@ -47,9 +49,9 @@ namespace CIAO_LOBO_Test_Sender_Impl
       {
         try
           {
-            ::LOBO_Test::ListenOneByOneTestConnector::Writer_var writer =
-              this->context_->get_connection_info_write_data ();
             ++this->last_key_->second->iteration;
+            ::LOBO_Test::ListenOneByOneTestConnector::Writer_var writer =
+              this->ciao_context_->get_connection_info_write_data ();
             writer->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
             ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
                           this->last_key_->first.c_str (),
@@ -65,13 +67,13 @@ namespace CIAO_LOBO_Test_Sender_Impl
       }
     else
       {
-        //onto the next iteration
+        // Onto the next iteration
         this->last_key_ = this->samples_.begin ();
         while (this->last_key_ != this->samples_.end ())
           {
             if (this->last_key_->second->iteration == this->iterations_)
               {
-                //next key
+                // Next key
                 ++this->last_key_;
               }
             else
@@ -81,7 +83,7 @@ namespace CIAO_LOBO_Test_Sender_Impl
           }
         if (this->last_key_ == this->samples_.end ())
           {
-            this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
+            this->reactor ()->cancel_timer (this->ticker_);
           }
       }
   }
@@ -100,11 +102,10 @@ namespace CIAO_LOBO_Test_Sender_Impl
         ACE_OS::sprintf (key, "KEY_%d", i);
         new_key->key = CORBA::string_dup(key);
         new_key->iteration = 0;
-
         this->samples_[key] = new_key;
       }
    this->last_key_ = this->samples_.begin ();
-   if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
+   if (this->reactor ()->schedule_timer (
                 this->ticker_,
                 0,
                 ACE_Time_Value (5, 50000),
@@ -115,37 +116,66 @@ namespace CIAO_LOBO_Test_Sender_Impl
       }
   }
 
+  // Supported operations and attributes.
+  ACE_Reactor*
+  Sender_exec_i::reactor (void)
+  {
+    ACE_Reactor* reactor = 0;
+    ::CORBA::Object_var ccm_object =
+      this->ciao_context_->get_CCM_object();
+    if (! ::CORBA::is_nil (ccm_object.in ()))
+      {
+        ::CORBA::ORB_var orb = ccm_object->_get_orb ();
+        if (! ::CORBA::is_nil (orb.in ()))
+          {
+            reactor = orb->orb_core ()->reactor ();
+          }
+      }
+    if (reactor == 0)
+      {
+        throw ::CORBA::INTERNAL ();
+      }
+    return reactor;
+  }
+
+  // Component attributes and port operations.
+
   ::CORBA::UShort
-  Sender_exec_i::iterations (void)
+  Sender_exec_i::keys (void)
   {
-    return this->iterations_;
+    return this->keys_;
   }
 
   void
-  Sender_exec_i::iterations (::CORBA::UShort iterations)
+  Sender_exec_i::keys (
+    const ::CORBA::UShort keys)
   {
-    this->iterations_ = iterations;
+    this->keys_ = keys;
   }
 
   ::CORBA::UShort
-  Sender_exec_i::keys (void)
+  Sender_exec_i::iterations (void)
   {
-    return this->keys_;
+    return this->iterations_;
   }
 
   void
-  Sender_exec_i::keys (::CORBA::UShort keys)
+  Sender_exec_i::iterations (
+    const ::CORBA::UShort iterations)
   {
-    this->keys_ = keys;
+    this->iterations_ = iterations;
   }
 
+  // Operations from Components::SessionComponent.
+
   void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
+  Sender_exec_i::set_session_context (
+    ::Components::SessionContext_ptr ctx)
   {
-    this->context_ =
+    this->ciao_context_ =
       ::LOBO_Test::CCM_Sender_Context::_narrow (ctx);
 
-    if ( ::CORBA::is_nil (this->context_.in ()))
+    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
       {
         throw ::CORBA::INTERNAL ();
       }
@@ -179,11 +209,13 @@ namespace CIAO_LOBO_Test_Sender_Impl
   void
   Sender_exec_i::ccm_passivate (void)
   {
+    /* Your code here. */
   }
 
   void
   Sender_exec_i::ccm_remove (void)
   {
+    /* Your code here. */
   }
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
index 8611502d9bd..e8f33cb2dd5 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.h
@@ -1,18 +1,18 @@
 // -*- C++ -*-
 // $Id$
 
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
+#ifndef CIAO_LOBO_TEST_SENDER_EXEC_QGSN5C_H_
+#define CIAO_LOBO_TEST_SENDER_EXEC_QGSN5C_H_
 
+#include /**/ "ace/pre.h"
 
 #include "LOBO_Test_SenderEC.h"
 
-#include /**/ "Sender_exec_export.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include /**/ "Sender_exec_export.h"
 #include "tao/LocalObject.h"
 
 #include <map>
@@ -35,7 +35,11 @@ namespace CIAO_LOBO_Test_Sender_Impl
     Sender_exec_i &callback_;
   };
 
-  class Sender_exec_i
+  //============================================================
+  // Component Executor Implementation Class: Sender_exec_i
+  //============================================================
+
+  class SENDER_EXEC_Export Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
   {
@@ -43,14 +47,25 @@ namespace CIAO_LOBO_Test_Sender_Impl
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
 
-    virtual ::CORBA::UShort iterations (void);
+    //@{
+    /** Supported operations and attributes. */
+
+    //@}
 
-    virtual void iterations (::CORBA::UShort iterations);
+    //@{
+    /** Component attributes and port operations. */
 
     virtual ::CORBA::UShort keys (void);
 
     virtual void keys (::CORBA::UShort keys);
 
+    virtual ::CORBA::UShort iterations (void);
+
+    virtual void iterations (::CORBA::UShort iterations);//@}
+
+    //@{
+    /** Operations from Components::SessionComponent. */
+
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
 
     virtual void configuration_complete (void);
@@ -58,28 +73,34 @@ namespace CIAO_LOBO_Test_Sender_Impl
     virtual void ccm_activate (void);
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
+    //@}
 
+    //@{
+    /** User defined operations */
     void start (void);
     void write_one (void);
+    //@}
 
   private:
-    ::LOBO_Test::CCM_Sender_Context_var context_;
+    ::LOBO_Test::CCM_Sender_Context_var ciao_context_;
 
-    WriteTicker *ticker_;
+    ::CORBA::UShort keys_;
 
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
+    ::CORBA::UShort iterations_;
 
+    ACE_Reactor* reactor (void);
+
+    WriteTicker *ticker_;
     TAO_SYNCH_MUTEX mutex_;
     typedef std::map<ACE_CString, ListenOneByOneTest_var> Writer_Table;
     Writer_Table samples_;
-
     Writer_Table::iterator last_key_;
- };
+  };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
   create_LOBO_Test_Sender_Impl (void);
 }
 
-#endif /* ifndef */
+#include /**/ "ace/post.h"
 
+#endif /* ifndef */