Fri Oct 22 07:50:54 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
        * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
        * TAO_IDL/be_include/be_visitor_component/executor_exh.h:
        * TAO_IDL/be_include/be_visitor_component/facet_exh.h:
          Removed some more trailing whitespaces from the
          generated code.
          Added comment.

5 files changed, 24 insertions, 18 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
index af9d31acf25..dd0451c8810 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
@@ -14,7 +14,9 @@
 
 be_visitor_executor_exh::be_visitor_executor_exh (
       be_visitor_context *ctx)
-  : be_visitor_component_scope (ctx)
+  : be_visitor_component_scope (ctx),
+    comment_border_ ("//=============================="
+                   "==============================")
 {
   // This is initialized in the base class to svnt_export_macro()
   // or skel_export_macro(), since there are many more visitor
@@ -59,6 +61,12 @@ be_visitor_executor_exh::visit_component (be_component *node)
   const char *global = (sname_str == "" ? "" : "::");
 
   os_ << be_nl_2
+      << comment_border_ << be_nl
+      << "// Component Executor Implementation Class: "
+      << lname << "_exec_i" << be_nl
+      << comment_border_;
+
+  os_ << be_nl_2
       << "class " << export_macro_.c_str () << " " << lname
       << "_exec_i" << be_idt_nl
       << ": public virtual " << lname << "_Exec," << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
index ef026be7bb2..8acd681351f 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
@@ -133,21 +133,6 @@ be_visitor_executor_exs::visit_attribute (be_attribute *node)
 int
 be_visitor_executor_exs::visit_component (be_component *node)
 {
-  // In the interest of pretty formatting, if we have generated
-  // at least one facet executor impl class, add a linebreak.
-  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
-       !si.is_done ();
-       si.next ())
-    {
-      AST_Decl *d = si.item ();
-
-      if (d->node_type () == AST_Decl::NT_provides)
-        {
-          os_ << be_nl;
-          break;
-        }
-    }
-
   node_ = node;
   const char *lname = node->local_name ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
index 3c36b94a950..4a02c627351 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
@@ -14,7 +14,9 @@
 
 be_visitor_facet_exh::be_visitor_facet_exh (
       be_visitor_context *ctx)
-  : be_visitor_component_scope (ctx)
+  : be_visitor_component_scope (ctx),
+    comment_border_ ("//=============================="
+                   "==============================")
 {
   // This is initialized in the base class to svnt_export_macro()
   // or skel_export_macro(), since there are many more visitor
@@ -49,6 +51,12 @@ be_visitor_facet_exh::visit_provides (be_provides *node)
   const char *smart_scope = (is_global ? "" : "::");
 
   os_ << be_nl_2
+      << comment_border_ << be_nl
+      << "// Provider Executor Implementation Class: "
+      << lname << "_exec_i" << be_nl
+      << comment_border_;
+
+  os_ << be_nl_2
       << "class " << export_macro_.c_str () << " "
       << lname << "_exec_i" << be_idt_nl
       << ": public virtual " << global << sname << "::CCM_"
@@ -106,7 +114,7 @@ be_visitor_facet_exh::visit_provides (be_provides *node)
       << smart_scope << c_scope->full_name () << "::CCM_"
       << this->node_->local_name ()
       << "_Context_var ciao_context_;" << be_uidt_nl
-      << "};" << be_nl_2;
+      << "};";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
index eef5f7de9d0..366f03613ce 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
@@ -37,6 +37,8 @@ public:
   virtual int visit_component (be_component *node);
   virtual int visit_provides (be_provides *node);
   virtual int visit_consumes (be_consumes *node);
+private:
+  const char *comment_border_;
 };
 
 #endif /* _BE_COMPONENT_EXECUTOR_EXH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
index 64bf6b02716..8a0b0d0700a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
@@ -33,6 +33,9 @@ public:
   ~be_visitor_facet_exh (void);
 
   virtual int visit_provides (be_provides *node);
+
+private:
+  const char *comment_border_;
 };
 
 #endif /* _BE_COMPONENT_FACET_EXH_H_ */