ChangeLogTag: Fri Dec 3 11:34:37 2004 Dale Wilson <wilson_d@ociweb.com>

11 files changed, 44 insertions, 53 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 311c9578ccf..6302216093c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,14 +1,34 @@
+Fri Dec  3 11:34:37 2004  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Admin.h:
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannel.h:
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.h:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.cpp:
+          To the extent possible:
+          Avoid overloading the init method name -- use
+          other names.
+          Make the init method(s) non-virtual.
+          AFAIK the only one "questionable" usage is:
+          TAO_Notify_Supplier_Admin and TAO_Notify_Consumer_Admin
+          override the non-virtual init method in TAO_Notify_Admin.
+
 Fri Dec  3 09:20:38 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
 
-	  Updated.
+          Updated.
 
-	* orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-	  Removed unnecessary/unused #include "tao/IORTable/IORTable.h".
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
+          Removed unnecessary/unused #include "tao/IORTable/IORTable.h".
 
-	* orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
-	  Removed inheritance from iortable.
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
+          Removed inheritance from iortable.
 
 Fri Dec  3 09:13:46 2004  Dale Wilson  <wilson_d@ociweb.com>
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 2138beff39f..889a1fab24f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -39,16 +39,10 @@ TAO_Notify_Admin::~TAO_Notify_Admin ()
   this->ec_->_decr_refcnt ();
 }
 
-// for VC6.  Otherwise calling Tao_Notify::TopologyObject::init confuses the parser
-typedef TAO_Notify::Topology_Object TAO_Notify_Topology_Object;
-
 void
-TAO_Notify_Admin::init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::init (TAO_Notify_EventChannel * ec ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Topology_Object::init (parent ACE_ENV_ARG_PARAMETER);
-
-  this->ec_ = dynamic_cast<TAO_Notify_EventChannel *>(parent);
-  ACE_ASSERT (this->ec_ != 0);
+  set_parent (ec ACE_ENV_ARG_PARAMETER);
 
   this->ec_->_incr_refcnt ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index 3e67f4303ed..df4678b0503 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -49,7 +49,7 @@ public:
   ~TAO_Notify_Admin ();
 
   /// Init
-  void init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_EventChannel * ec ACE_ENV_ARG_DECL);
 
   /// Insert the proxy in the <proxy_container_>.
   void insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 52894595d8d..bafe725b673 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -26,9 +26,6 @@
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
-// for VC6.  Otherwise calling Tao_Notify::TopologyObject::init confuses the parser
-using namespace TAO_Notify;
-
 ACE_RCSID(Notify, TAO_Notify_EventChannel, "$Id$")
 
 typedef TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin
@@ -60,16 +57,13 @@ TAO_Notify_EventChannel::~TAO_Notify_EventChannel ()
   this->ecf_->_decr_refcnt ();
 }
 
-// for VC6.  Otherwise calling Tao_Notify::TopologyObject::init confuses the parser
-typedef TAO_Notify::Topology_Object TAO_Notify_Topology_Object;
-
 void
 TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
                            , const CosNotification::QoSProperties & initial_qos
                            , const CosNotification::AdminProperties & initial_admin
                            ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Topology_Object::init (ecf ACE_ENV_ARG_PARAMETER);
+  set_parent (ecf ACE_ENV_ARG_PARAMETER);
 
   this->ecf_ = ecf;
 
@@ -132,13 +126,10 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
 
 
 void
-TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent * parent
+TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory * ecf
                            ACE_ENV_ARG_DECL)
 {
-  Topology_Object::init (parent ACE_ENV_ARG_PARAMETER);
-
-  this->ecf_ = dynamic_cast <TAO_Notify_EventChannelFactory*>(parent);
-  ACE_ASSERT (this->ecf_ != 0);
+  Topology_Object::set_parent (ecf ACE_ENV_ARG_PARAMETER);
 
   this->ecf_->_incr_refcnt ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index 43dce44913b..c52843ac570 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -67,7 +67,7 @@ public:
              ACE_ENV_ARG_DECL);
 
   /// Init (for reload)
-  void init (TAO_Notify::Topology_Parent * parent
+  void init (TAO_Notify_EventChannelFactory* ecf
              ACE_ENV_ARG_DECL);
 
   /// Remove ConsumerAdmin from its container.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index ca165d7d50c..5193222c9d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -26,10 +26,6 @@ ACE_RCSID(RT_Notify, TAO_Notify_ProxyConsumer, "$Id$")
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
-// for VC6.  Otherwise calling Tao_Notify::TopologyObject::init confuses the parser
-using namespace TAO_Notify;
-
-
 TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer (void)
   : supplier_admin_ (0)
   , supplier_ (0)
@@ -47,16 +43,12 @@ TAO_Notify_ProxyConsumer::peer (void)
   return this->supplier ();
 }
 
-// for VC6.  Otherwise calling Tao_Notify::TopologyObject::init confuses the parser
-typedef TAO_Notify::Topology_Object TAO_Notify_Topology_Object;
-
 void
-TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent * topology_parent ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::init (TAO_Notify_SupplierAdmin * supplier_admin ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Topology_Object::init (topology_parent ACE_ENV_ARG_PARAMETER);
+  set_parent (supplier_admin ACE_ENV_ARG_PARAMETER);
 
-  this->supplier_admin_ = dynamic_cast<TAO_Notify_SupplierAdmin *>(topology_parent);
-  ACE_ASSERT(this->supplier_admin_ != 0);
+  this->supplier_admin_ = supplier_admin;
 
   this->supplier_admin_->_incr_refcnt ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 862ffcddedd..bdfeee329c7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -47,8 +47,8 @@ public:
   /// Destructor
   ~TAO_Notify_ProxyConsumer ();
 
-  /// init: overrides Topology_Object method
-  virtual void init (TAO_Notify::Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
+  /// Initialize with pointer to parent
+  void init (TAO_Notify_SupplierAdmin * supplier_admin ACE_ENV_ARG_DECL);
 
   /// Connect
   void connect (TAO_Notify_Supplier* supplier ACE_ENV_ARG_DECL)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index 0cbfb81f11c..5e606852504 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -17,9 +17,6 @@ ACE_RCSID(RT_Notify, TAO_Notify_ProxySupplier, "$Id$")
 #include "Properties.h"
 #include "ConsumerAdmin.h"
 
-// for VC6.  Otherwise calling Tao_Notify::TopologyObject::init confuses the parser
-using namespace TAO_Notify;
-
 TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (void)
   : consumer_admin_ (0)
   , consumer_ (0)
@@ -31,13 +28,10 @@ TAO_Notify_ProxySupplier::~TAO_Notify_ProxySupplier ()
   this->consumer_admin_->_decr_refcnt ();
 }
 
-// for VC6.  Otherwise calling Tao_Notify::TopologyObject::init confuses the parser
-typedef TAO_Notify::Topology_Object TAO_Notify_Topology_Object;
-
 void
-TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin * consumer_admin ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Topology_Object::init (consumer_admin ACE_ENV_ARG_PARAMETER);
+  set_parent (consumer_admin ACE_ENV_ARG_PARAMETER);
 
   this->consumer_admin_ = consumer_admin;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index a099204f539..6a186c0af0c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -45,7 +45,7 @@ public:
   virtual ~TAO_Notify_ProxySupplier ();
 
   /// Init
-  virtual void init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
 
   /// Connect
   void connect (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index c9ce036da66..fc4cc158894 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -33,7 +33,7 @@ namespace TAO_Notify
   }
 
   void
-  Topology_Object::init (Topology_Parent * topology_parent ACE_ENV_ARG_DECL_NOT_USED)
+  Topology_Object::set_parent (Topology_Parent * topology_parent ACE_ENV_ARG_DECL_NOT_USED)
   {
     this->topology_parent_ = topology_parent;
     initialize (topology_parent);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 8d2799f5c43..d2727f05e70 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -103,8 +103,8 @@ namespace TAO_Notify
     /// The destructor.
     virtual ~Topology_Object ();
 
-    /// Init this object with data from <rhs>.
-    virtual void init(Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
+    /// set this objects parent and initialize _Object
+    void set_parent(Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
 
     /// \brief Create a child of the appropriate type and return it.
     ///