strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS adc18 (1.4.2); FILE MERGED

Browse source 
2007/10/18 15:23:12 np 1.4.2.1: #i81775#
This commit is contained in:
Jens-Heiner Rechtien 2007-11-02 15:25:51 +00:00
parent 0cee586f5d
commit 8efc941d6c
3 changed files with 76 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
autodoc/source/display/html/dsply_cl.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: dsply_cl.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: vg $ $Date: 2007-09-18 13:50:59 $
* last change: $Author: hr $ $Date: 2007-11-02 16:24:50 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -38,8 +38,8 @@
// NOT FULLY DEFINED SERVICES
#include <ary/cpp/c_disply.hxx>
#include <ary/cpp/c_class.hxx>
#include <ary/cpp/c_gate.hxx>
#include "dsply_da.hxx"
#include "dsply_op.hxx"
#include "hdimpl.hxx"
@ -58,20 +58,6 @@ ClassDisplayer::~ClassDisplayer()
{
}
void
ClassDisplayer::Display_Class( const ary::cpp::Class & i_rData )
{
if ( Ce_IsInternal(i_rData) )
return;
PageDisplay aPageMaker( Env() );
aPageMaker.Display_Class(i_rData);
Env().MoveDir_Down2( i_rData );
DisplayFiles_InClass( i_rData, aPageMaker );
Env().MoveDir_Up();
}
void
ClassDisplayer::DisplayFiles_InClass( const ary::cpp::Class & i_rData,
PageDisplay & io_rPageMaker )
@ -109,10 +95,22 @@ ClassDisplayer::DisplayFiles_InClass( const ary::cpp::Class & i_rData,
aDataDisplayer.Create_Files();
}
const ary::DisplayGate *
void
ClassDisplayer::do_Process( const ary::cpp::Class & i_rData )
{
if ( Ce_IsInternal(i_rData) )
return;
PageDisplay aPageMaker( Env() );
aPageMaker.Process(i_rData);
Env().MoveDir_Down2( i_rData );
DisplayFiles_InClass( i_rData, aPageMaker );
Env().MoveDir_Up();
}
const ary::cpp::Gate *
ClassDisplayer::inq_Get_ReFinder() const
{
return & pEnv->Gate();
}

57
autodoc/source/display/html/dsply_da.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: dsply_da.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: vg $ $Date: 2007-09-18 13:51:13 $
* last change: $Author: hr $ $Date: 2007-11-02 16:25:16 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -38,10 +38,12 @@
// NOT FULLY DEFINED SERVICES
#include <cosv/template/tpltools.hxx>
#include <ary/cpp/c_disply.hxx>
#include <ary/cpp/crog_grp.hxx>
#include <cosv/tpl/tpltools.hxx>
#include <ary/cpp/c_gate.hxx>
#include <ary/cpp/c_vari.hxx>
#include <ary/doc/d_docu.hxx>
#include <ary/loc/loc_file.hxx>
#include <ary/loc/locp_le.hxx>
#include <udm/html/htmlitem.hxx>
#include "hd_docu.hxx"
#include "hdimpl.hxx"
@ -55,8 +57,8 @@ using namespace csi;
DataDisplay::DataDisplay( OuputPage_Environment & io_rEnv )
: // aMap_GlobalDataDisplay,
// pClassMembersDisplay,
: aMap_GlobalDataDisplay(),
pClassMembersDisplay(0),
pEnv( &io_rEnv ),
pDocuShow( new Docu_Display(io_rEnv) )
{
@ -67,18 +69,6 @@ DataDisplay::~DataDisplay()
csv::erase_map_of_heap_ptrs( aMap_GlobalDataDisplay );
}
void
DataDisplay::Display_Variable( const ary::cpp::Variable & i_rData )
{
if ( Ce_IsInternal(i_rData) )
return;
PageDisplay & rPage = FindPage_for( i_rData );
csi::xml::Element & rOut = rPage.CurOut();
Display_SglDatum( rOut, i_rData );
}
void
DataDisplay::PrepareForConstants()
{
@ -131,7 +121,19 @@ DataDisplay::Create_Files()
}
}
const ary::DisplayGate *
void
DataDisplay::do_Process( const ary::cpp::Variable & i_rData )
{
if ( Ce_IsInternal(i_rData) )
return;
PageDisplay & rPage = FindPage_for( i_rData );
csi::xml::Element & rOut = rPage.CurOut();
Display_SglDatum( rOut, i_rData );
}
const ary::cpp::Gate *
DataDisplay::inq_Get_ReFinder() const
{
return & pEnv->Gate();
@ -146,14 +148,13 @@ DataDisplay::FindPage_for( const ary::cpp::Variable & i_rData )
SourceFileId
nSourceFile = i_rData.Location();
PageDisplay *
pFound = csv::value_from_map( aMap_GlobalDataDisplay, nSourceFile );
pFound = csv::value_from_map( aMap_GlobalDataDisplay, nSourceFile, (PageDisplay*)0 );
if ( pFound == 0 )
{
pFound = new PageDisplay( *pEnv );
const ary::cpp::FileGroup *
pFgr = pEnv->Gate().RoGroups().Search_FileGroup( nSourceFile );
csv_assert( pFgr != 0 );
pFound->Setup_DataFile_for( *pFgr );
const ary::loc::File &
rFile = pEnv->Gate().Locations().Find_File( nSourceFile );
pFound->Setup_DataFile_for(rFile);
aMap_GlobalDataDisplay[nSourceFile] = pFound;
}
@ -198,11 +199,9 @@ DataDisplay::Display_SglDatum( csi::xml::Element & rOut,
aDocu.AddEntry_NoTerm();
pDocuShow->Assign_Out( aDocu.Def() );
i_rData.Info().StoreAt( *pDocuShow );
pDocuShow->Assign_Out(aDocu.Def());
pDocuShow->Process(i_rData.Docu());
pDocuShow->Unassign_Out();
rOut << new html::HorizontalLine;
}

60
autodoc/source/display/html/dsply_op.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: dsply_op.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: vg $ $Date: 2007-09-18 13:51:27 $
* last change: $Author: hr $ $Date: 2007-11-02 16:25:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -38,10 +38,10 @@
// NOT FULLY DEFINED SERVICES
#include <cosv/template/tpltools.hxx>
#include <ary/cpp/c_disply.hxx>
#include <ary/cpp/crog_grp.hxx>
#include <cosv/tpl/tpltools.hxx>
#include <ary/cpp/c_funct.hxx>
#include <ary/cpp/c_gate.hxx>
#include <ary/loc/locp_le.hxx>
#include <udm/html/htmlitem.hxx>
#include "hd_docu.hxx"
#include "hdimpl.hxx"
@ -49,13 +49,12 @@
#include "opageenv.hxx"
#include "pagemake.hxx"
using namespace csi;
using namespace adcdisp;
OperationsDisplay::OperationsDisplay( OuputPage_Environment & io_rEnv )
: // aMap_GlobalFunctionsDisplay,
// pClassMembersDisplay,
@ -69,18 +68,6 @@ OperationsDisplay::~OperationsDisplay()
csv::erase_map_of_heap_ptrs( aMap_GlobalFunctionsDisplay );
}
void
OperationsDisplay::Display_Function( const ary::cpp::Function & i_rData )
{
if ( Ce_IsInternal(i_rData) )
return;
PageDisplay & rPage = FindPage_for( i_rData );
csi::xml::Element & rOut = rPage.CurOut();
Display_SglOperation( rOut, i_rData );
}
void
OperationsDisplay::PrepareForGlobals()
{
@ -123,7 +110,19 @@ OperationsDisplay::Create_Files()
}
}
const ary::DisplayGate *
void
OperationsDisplay::do_Process( const ary::cpp::Function & i_rData )
{
if ( Ce_IsInternal(i_rData) )
return;
PageDisplay & rPage = FindPage_for( i_rData );
csi::xml::Element & rOut = rPage.CurOut();
Display_SglOperation( rOut, i_rData );
}
const ary::cpp::Gate *
OperationsDisplay::inq_Get_ReFinder() const
{
return & pEnv->Gate();
@ -138,14 +137,13 @@ OperationsDisplay::FindPage_for( const ary::cpp::Function & i_rData )
SourceFileId
nSourceFile = i_rData.Location();
PageDisplay *
pFound = csv::value_from_map( aMap_GlobalFunctionsDisplay, nSourceFile );
pFound = csv::value_from_map( aMap_GlobalFunctionsDisplay, nSourceFile, (PageDisplay*)0 );
if ( pFound == 0 )
{
pFound = new PageDisplay( *pEnv );
const ary::cpp::FileGroup *
pFgr = pEnv->Gate().RoGroups().Search_FileGroup( nSourceFile );
csv_assert( pFgr != 0 );
pFound->Setup_OperationsFile_for( *pFgr );
const ary::loc::File &
rFile = pEnv->Gate().Locations().Find_File( nSourceFile );
pFound->Setup_OperationsFile_for(rFile);
aMap_GlobalFunctionsDisplay[nSourceFile] = pFound;
}
@ -159,8 +157,12 @@ OperationsDisplay::Display_SglOperation( csi::xml::Element & rOut,
adcdisp::ExplanationList aDocu(rOut, true);
aDocu.AddEntry( 0 );
adcdisp::OperationTitle fTitle;
fTitle( aDocu.Term(), i_rData.LocalName(), i_rData.Signature() );
fTitle( aDocu.Term(),
i_rData.LocalName(),
i_rData.CeId(),
pEnv->Gate() );
// Syntax
adcdisp::ExplanationList aSyntaxHeader(aDocu.Def());
@ -214,11 +216,9 @@ OperationsDisplay::Display_SglOperation( csi::xml::Element & rOut,
// Docu
aDocu.AddEntry_NoTerm();
pDocuShow->Assign_Out( aDocu.Def() );
i_rData.Info().StoreAt( *pDocuShow );
pDocuShow->Assign_Out(aDocu.Def());
pDocuShow->Process(i_rData.Docu());
pDocuShow->Unassign_Out();
rOut << new html::HorizontalLine;
}