[ccmtools-cvs] ccmtools/src/templates/CppLocalTemplates MProvidesDefGetFacetPointerInit, NONE, 1.1 MComponentDef, 1.24, 1.25 MProvidesDef, 1.12, 1.13 MProvidesDefGetFacetPrototype, 1.1, 1.2 MProvidesDefGetFacetDefinition, 1.7, 1.8

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3015/src/templates/CppLocalTemplates

Modified Files:
	MComponentDef MProvidesDef MProvidesDefGetFacetPrototype 
	MProvidesDefGetFacetDefinition 
Added Files:
	MProvidesDefGetFacetPointerInit 
Log Message:
C++ assemblies

Index: MProvidesDefGetFacetPrototype
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MProvidesDefGetFacetPrototype,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MProvidesDefGetFacetPrototype	8 Jul 2004 12:02:51 -0000	1.1
--- MProvidesDefGetFacetPrototype	21 Feb 2007 16:04:48 -0000	1.2
***************
*** 1,2 ****
--- 1,5 ----
+ private:
+     %(CCMProvidesType)s* %(Identifier)s_;
+ public:
      virtual %(CCMProvidesType)s* get_%(Identifier)s();
  

--- NEW FILE: MProvidesDefGetFacetPointerInit ---
    %(Identifier)s_ = NULL;

Index: MProvidesDef
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MProvidesDef,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MProvidesDef	5 Jan 2007 14:17:25 -0000	1.12
--- MProvidesDef	21 Feb 2007 16:04:48 -0000	1.13
***************
*** 17,22 ****
--- 17,26 ----
      : virtual public %(CCMProvidesType)s
  {
+   public:
+     friend class %(ComponentType)s_impl;
+   
    protected:
      %(ComponentType)s_impl* component;
+ %(AssemblyTargetVariable)s
  %(MAttributeDefVariable)s
  

Index: MProvidesDefGetFacetDefinition
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MProvidesDefGetFacetDefinition,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MProvidesDefGetFacetDefinition	5 Jan 2007 14:17:25 -0000	1.7
--- MProvidesDefGetFacetDefinition	21 Feb 2007 16:04:48 -0000	1.8
***************
*** 8,12 ****
      %(ComponentType)s_%(Identifier)s_impl* facet = 
          new %(ComponentType)s_%(Identifier)s_impl(this);
!     return dynamic_cast< %(CCMProvidesType)s*>(facet);
  }
  
--- 8,13 ----
      %(ComponentType)s_%(Identifier)s_impl* facet = 
          new %(ComponentType)s_%(Identifier)s_impl(this);
!     %(Identifier)s_ = dynamic_cast< %(CCMProvidesType)s* >(facet);
!     return %(Identifier)s_;
  }
  

Index: MComponentDef
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MComponentDef,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** MComponentDef	20 Feb 2007 15:36:41 -0000	1.24
--- MComponentDef	21 Feb 2007 16:04:48 -0000	1.25
***************
*** 477,480 ****
--- 477,481 ----
  #include "%(Identifier)s_impl.h"
  %(MProvidesDefImplInclude)s
+ %(AssemblyInnerHomeInclude)s
  
  %(OpenNamespace)s
***************
*** 488,491 ****
--- 489,493 ----
  %(Identifier)s_impl::%(Identifier)s_impl()
  {
+ %(MProvidesDefGetFacetPointerInit)s
  %(AssemblyInnerComponentVariableCreation)s
  }
***************
*** 493,497 ****
  %(Identifier)s_impl::~%(Identifier)s_impl()
  {
- %(AssemblyInnerComponentVariableDestruction)s
  }
  
--- 495,498 ----
***************
*** 510,514 ****
      throw(Components::CCMException)
  {
!     // OPTIONAL : IMPLEMENT ME HERE !
  }
  
--- 511,519 ----
      throw(Components::CCMException)
  {
!     try {
! %(AssemblyCcmActivate)s
!     } catch(...) {
!         throw Components::CCMException(Components::CREATE_ERROR);
!     }
  }
  
***************
*** 517,521 ****
      throw(Components::CCMException)
  {
!     // OPTIONAL : IMPLEMENT ME HERE !
  }
  
--- 522,526 ----
      throw(Components::CCMException)
  {
!     // Who calls this method?
  }
  
***************
*** 524,528 ****
      throw(Components::CCMException)
  {
!     // OPTIONAL : IMPLEMENT ME HERE !
  }
  
--- 529,537 ----
      throw(Components::CCMException)
  {
!     try {
! %(AssemblyCcmRemove)s
!     } catch(...) {
!         throw Components::CCMException(Components::REMOVE_ERROR);
!     }
  }