INTEGRATION: CWS adc8 (1.3.84); FILE MERGED

2004/07/02 11:04:14 np 1.3.84.1: #i26261#

1 files changed, 63 insertions, 16 deletions

diff --git a/autodoc/source/display/idl/hi_main.cxx b/autodoc/source/display/idl/hi_main.cxx
index c7c4861c94c2..235ab2282717 100644
--- a/autodoc/source/display/idl/hi_main.cxx
+++ b/autodoc/source/display/idl/hi_main.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hi_main.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: np $ $Date: 2002-11-29 10:20:06 $
+ *  last change: $Author: rt $ $Date: 2004-07-12 15:31:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,6 +74,7 @@
 #include <ary/idl/ik_exception.hxx>
 #include <ary/idl/ik_interface.hxx>
 #include <ary/idl/ik_service.hxx>
+#include <ary/idl/ik_siservice.hxx>
 #include <ary/idl/ik_struct.hxx>
 #include <ary/idl/ik_typedef.hxx>
 #include <cfrstd.hxx>
@@ -88,6 +89,7 @@
 #include "hfi_struct.hxx"
 #include "hfi_service.hxx"
 #include "hfi_singleton.hxx"
+#include "hfi_siservice.hxx"
 #include "hfi_typedef.hxx"
 #include "hfi_xrefpage.hxx"
 #include "hi_env.hxx"
@@ -100,7 +102,7 @@ using       ::ary::idl::ifc_ce::Dyn_CeIterator;
 
 
 /*
-typedef     ::ary::Dyn_StdConstIterator< ::ary::idl::CommentedReference>
+typedef     ::ary::Dyn_StdConstIterator< ::ary::idl::CommentedRelation>
             Dyn_ComRefIterator;
 namespace   read_module     = ::ary::idl::ifc_module;
 namespace   read_interface  = ::ary::idl::ifc_interface;
@@ -325,6 +327,12 @@ MainDisplay_Idl::do_Service( const ary::idl::CodeEntity & i_ce )
 }
 
 void
+MainDisplay_Idl::do_SglIfcService( const ary::idl::CodeEntity & i_ce )
+{
+    do_SglIfcServiceDescr(i_ce);
+}
+
+void
 MainDisplay_Idl::do_Struct( const ary::idl::CodeEntity & i_ce )
 {
     do_StructDescr(i_ce);
@@ -375,9 +383,21 @@ MainDisplay_Idl::do_Singleton( const ary::idl::CodeEntity & i_ce )
     HF_IdlSingleton     aFactory( *pEnv, pMyFile->Body() );
     Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
 
-    aFactory.Produce_byData(i_ce);
+    aFactory.Produce_byData_ServiceBased(i_ce);
 }
 
+void
+MainDisplay_Idl::do_SglIfcSingleton( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Singleton" );
+    HF_IdlSingleton     aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData_InterfaceBased(i_ce);
+}
 
 void
 MainDisplay_Idl::do_InterfaceDescr( const ary::idl::CodeEntity & i_ce )
@@ -406,6 +426,19 @@ MainDisplay_Idl::do_ServiceDescr( const ary::idl::CodeEntity & i_ce )
 }
 
 void
+MainDisplay_Idl::do_SglIfcServiceDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Service" );
+    HF_IdlSglIfcService aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
 MainDisplay_Idl::do_StructDescr( const ary::idl::CodeEntity & i_ce )
 {
     Guard_CurFile       gFile( *pMyFile,
@@ -474,12 +507,15 @@ MainDisplay_Idl::do_Interface2s( const ary::idl::CodeEntity & i_ce )
                                C_sCePrefix_Interface,
                                i_ce );
 
-    Dyn_CeIterator  pXrefList;
-    ary::idl::ifc_interface::xref::Get_Derivations(pXrefList,i_ce);
-    aUses.Produce_List(
+
+    aUses.Produce_Tree(
         "Derived Interfaces",
         "#Deriveds",
-        *pXrefList );
+        i_ce,
+        &ary::idl::ifc_interface::xref::Get_Derivations );
+
+    Dyn_CeIterator  pXrefList;
+
     ary::idl::ifc_interface::xref::Get_SynonymTypedefs(pXrefList,i_ce);
     aUses.Produce_List(
         "Synonym Typedefs",
@@ -490,6 +526,11 @@ MainDisplay_Idl::do_Interface2s( const ary::idl::CodeEntity & i_ce )
         "Services which Support this Interface",
         "#SupportingServices",
         *pXrefList );
+    ary::idl::ifc_interface::xref::Get_ExportingSingletons(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Singletons which Support this Interface",
+        "#SupportingSingletons",
+        *pXrefList );
     ary::idl::ifc_interface::xref::Get_AsReturns(pXrefList,i_ce);
     aUses.Produce_List(
         "Uses as Return Type",
@@ -555,12 +596,15 @@ MainDisplay_Idl::do_Struct2s( const ary::idl::CodeEntity & i_ce )
                             pMyFile->Body(),
                             C_sCePrefix_Struct,
                             i_ce );
-    Dyn_CeIterator  pXrefList;
-    ary::idl::ifc_struct::xref::Get_Derivations(pXrefList,i_ce);
-    aUses.Produce_List(
+
+    aUses.Produce_Tree(
         "Derived Structs",
         "#Deriveds",
-        *pXrefList );
+        i_ce,
+        &ary::idl::ifc_struct::xref::Get_Derivations );
+
+    Dyn_CeIterator  pXrefList;
+
     ary::idl::ifc_struct::xref::Get_SynonymTypedefs(pXrefList,i_ce);
     aUses.Produce_List(
         "Synonym Typedefs",
@@ -600,12 +644,15 @@ MainDisplay_Idl::do_Exception2s( const ary::idl::CodeEntity & i_ce )
                             pMyFile->Body(),
                             C_sCePrefix_Exception,
                             i_ce );
-    Dyn_CeIterator  pXrefList;
-    ary::idl::ifc_exception::xref::Get_Derivations(pXrefList,i_ce);
-    aUses.Produce_List(
+
+    aUses.Produce_Tree(
         "Derived Exceptions",
         "#Deriveds",
-        *pXrefList );
+        i_ce,
+        &ary::idl::ifc_exception::xref::Get_Derivations );
+
+    Dyn_CeIterator  pXrefList;
+
     ary::idl::ifc_exception::xref::Get_RaisingFunctions(pXrefList,i_ce);
     aUses.Produce_List(
         "Raising Functions",