Menu
▾
▴
[ccmtools-cvs] ccmtools/src/templates/CppLocalTemplates MComponentDef, 1.26, 1.27 MUsesDefGetConnectionPrototypeVVMultiple, 1.2, 1.3 MUsesDefAdapterDefinitionMultiple, 1.12, 1.13 MUsesDefGetConnectionCtxImplDefinitionMultiple, 1.6, 1.7 MUsesDefConnectionMapMultiple, 1.7, 1.8 MUsesDefConnectPrototype, 1.9, 1.10 MUsesDefGetConnectionPrototype, 1.9, 1.10 MUsesDefGetConnectionPrototypeMultiple, 1.4, 1.5 MUsesDefAdapterDefinition, 1.12, 1.13 MUsesDefGetCtxConnectionPrototypeMultiple, 1.4, 1.5 MUsesDefAdapterVariableMultiple, 1.4, 1.5
Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26491/src/templates/CppLocalTemplates Modified Files: MComponentDef MUsesDefGetConnectionPrototypeVVMultiple MUsesDefAdapterDefinitionMultiple MUsesDefGetConnectionCtxImplDefinitionMultiple MUsesDefConnectionMapMultiple MUsesDefConnectPrototype MUsesDefGetConnectionPrototype MUsesDefGetConnectionPrototypeMultiple MUsesDefAdapterDefinition MUsesDefGetCtxConnectionPrototypeMultiple MUsesDefAdapterVariableMultiple Log Message: *) disconnect implemented *) multiple receptacle prepared Index: MUsesDefGetConnectionPrototype =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefGetConnectionPrototype,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MUsesDefGetConnectionPrototype 5 Jan 2007 14:17:25 -0000 1.9 --- MUsesDefGetConnectionPrototype 1 Mar 2007 15:55:19 -0000 1.10 *************** *** 1,4 **** %(UsesType)s::SmartPtr get_connection_%(Identifier)s() ! throw(::Components::NoConnection); --- 1,4 ---- %(UsesType)s::SmartPtr get_connection_%(Identifier)s() ! throw(::Components::NoConnection, ::Components::InvalidConnection); Index: MUsesDefAdapterVariableMultiple =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefAdapterVariableMultiple,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MUsesDefAdapterVariableMultiple 3 Jan 2007 12:09:28 -0000 1.4 --- MUsesDefAdapterVariableMultiple 1 Mar 2007 15:55:19 -0000 1.5 *************** *** 1,3 **** long %(Identifier)s_receptacle_counter; ! %(UsesName)sConnections %(Identifier)s_receptacles; --- 1,3 ---- long %(Identifier)s_receptacle_counter; ! %(MultipleReceptacleName)s %(Identifier)s_receptacles; Index: MUsesDefGetConnectionCtxImplDefinitionMultiple =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefGetConnectionCtxImplDefinitionMultiple,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MUsesDefGetConnectionCtxImplDefinitionMultiple 3 Jan 2007 12:09:28 -0000 1.6 --- MUsesDefGetConnectionCtxImplDefinitionMultiple 1 Mar 2007 15:55:19 -0000 1.7 *************** *** 1,3 **** ! %(UsesName)sConnections& CCM_%(ComponentType)s_Context_impl::get_connections_%(Identifier)s() { --- 1,3 ---- ! %(MultipleReceptacleName)s& CCM_%(ComponentType)s_Context_impl::get_connections_%(Identifier)s() { Index: MUsesDefAdapterDefinitionMultiple =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefAdapterDefinitionMultiple,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MUsesDefAdapterDefinitionMultiple 5 Jan 2007 14:17:24 -0000 1.12 --- MUsesDefAdapterDefinitionMultiple 1 Mar 2007 15:55:19 -0000 1.13 *************** *** 35,39 **** } ! %(UsesName)sConnections& %(ComponentType)s::get_connections_%(Identifier)s ( ) { --- 35,39 ---- } ! %(MultipleReceptacleName)s& %(ComponentType)s::get_connections_%(Identifier)s ( ) { Index: MUsesDefGetConnectionPrototypeVVMultiple =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefGetConnectionPrototypeVVMultiple,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MUsesDefGetConnectionPrototypeVVMultiple 31 May 2005 17:52:17 -0000 1.2 --- MUsesDefGetConnectionPrototypeVVMultiple 1 Mar 2007 15:55:19 -0000 1.3 *************** *** 1,2 **** ! virtual %(Identifier)sConnections& get_connections_%(Identifier)s() = 0; --- 1,2 ---- ! virtual %(MultipleReceptacleType)s& get_connections_%(Identifier)s() = 0; Index: MComponentDef =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MComponentDef,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** MComponentDef 27 Feb 2007 15:19:23 -0000 1.26 --- MComponentDef 1 Mar 2007 15:55:19 -0000 1.27 *************** *** 359,362 **** --- 359,364 ---- virtual ~CCM_%(Identifier)s() {} + + virtual void disconnect(const std::string& receptacle) = 0; %(MAttributeDefPrototypeVV)s *************** *** 453,456 **** --- 455,460 ---- virtual void ccm_remove() throw(Components::CCMException); + + virtual void disconnect(const std::string& receptacle); }; *************** *** 539,542 **** --- 543,552 ---- } + void + %(Identifier)s_impl::disconnect(const std::string& receptacle) + { + %(AssemblyDisconnect)s + } + %(MProvidesDefGetFacetDefinition)s Index: MUsesDefConnectPrototype =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefConnectPrototype,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MUsesDefConnectPrototype 5 Jan 2007 14:17:25 -0000 1.9 --- MUsesDefConnectPrototype 1 Mar 2007 15:55:19 -0000 1.10 *************** *** 5,9 **** %(UsesType)s::SmartPtr disconnect_%(Identifier)s() ! throw(::Components::NoConnection); --- 5,9 ---- %(UsesType)s::SmartPtr disconnect_%(Identifier)s() ! throw(::Components::NoConnection, ::Components::InvalidConnection); Index: MUsesDefAdapterDefinition =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefAdapterDefinition,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MUsesDefAdapterDefinition 28 Feb 2007 08:03:28 -0000 1.12 --- MUsesDefAdapterDefinition 1 Mar 2007 15:55:19 -0000 1.13 *************** *** 16,20 **** %(UsesType)s::SmartPtr %(ComponentType)s::disconnect_%(Identifier)s() ! throw(::Components::NoConnection) { if(!ValidConnection) --- 16,20 ---- %(UsesType)s::SmartPtr %(ComponentType)s::disconnect_%(Identifier)s() ! throw(::Components::NoConnection, ::Components::InvalidConnection) { if(!ValidConnection) *************** *** 26,29 **** --- 26,30 ---- throw ::Components::NoConnection(); } + local_component->disconnect("%(Identifier)s"); %(UsesType)s::SmartPtr f = %(Identifier)s_receptacle; %(Identifier)s_receptacle.forget(); *************** *** 33,37 **** %(UsesType)s::SmartPtr %(ComponentType)s::get_connection_%(Identifier)s() ! throw(::Components::NoConnection) { if(!ValidConnection) --- 34,38 ---- %(UsesType)s::SmartPtr %(ComponentType)s::get_connection_%(Identifier)s() ! throw(::Components::NoConnection, ::Components::InvalidConnection) { if(!ValidConnection) Index: MUsesDefGetCtxConnectionPrototypeMultiple =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefGetCtxConnectionPrototypeMultiple,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MUsesDefGetCtxConnectionPrototypeMultiple 3 Jan 2007 12:09:28 -0000 1.4 --- MUsesDefGetCtxConnectionPrototypeMultiple 1 Mar 2007 15:55:19 -0000 1.5 *************** *** 1,2 **** ! %(UsesName)sConnections& get_connections_%(Identifier)s(); --- 1,2 ---- ! %(MultipleReceptacleName)s& get_connections_%(Identifier)s(); Index: MUsesDefConnectionMapMultiple =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefConnectionMapMultiple,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MUsesDefConnectionMapMultiple 5 Jan 2007 14:17:25 -0000 1.7 --- MUsesDefConnectionMapMultiple 1 Mar 2007 15:55:19 -0000 1.8 *************** *** 1,4 **** typedef std::map< ::Components::Cookie, ! %(CCMUsesType)s::SmartPtr> %(Identifier)sConnections; --- 1,4 ---- typedef std::map< ::Components::Cookie, ! %(CCMUsesType)s::SmartPtr> %(MultipleReceptacleType)s; Index: MUsesDefGetConnectionPrototypeMultiple =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefGetConnectionPrototypeMultiple,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MUsesDefGetConnectionPrototypeMultiple 3 Jan 2007 12:09:28 -0000 1.4 --- MUsesDefGetConnectionPrototypeMultiple 1 Mar 2007 15:55:19 -0000 1.5 *************** *** 1,2 **** ! %(UsesName)sConnections& get_connections_%(Identifier)s(); --- 1,2 ---- ! %(MultipleReceptacleName)s& get_connections_%(Identifier)s(); |
