increased version number to 2.1.5 and regenerated code for test fidl

[profile/ivi/common-api-dbus-runtime.git] / src / test / commonapi / tests / managed / SecondRootDBusStubAdapter.h

diff --git a/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.h b/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.h
index 8fdb7dc..70ef6eb 100644 (file)
--- a/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.h
+++ b/src/test/commonapi/tests/managed/SecondRootDBusStubAdapter.h
@@ -1,6 +1,6 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.3.qualifier.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.qualifier.
 * Used org.franca.core 0.8.10.201309262002.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -29,9 +29,9 @@ namespace managed {
 
 typedef CommonAPI::DBus::DBusStubAdapterHelper<SecondRootStub> SecondRootDBusStubAdapterHelper;
 
-class SecondRootDBusStubAdapter: public SecondRootStubAdapter, public SecondRootDBusStubAdapterHelper {
+class SecondRootDBusStubAdapterInternal: public SecondRootStubAdapter, public SecondRootDBusStubAdapterHelper {
  public:
-    SecondRootDBusStubAdapter(
+    SecondRootDBusStubAdapterInternal(
             const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
             const std::string& commonApiAddress,
             const std::string& dbusInterfaceName,
@@ -40,23 +40,53 @@ class SecondRootDBusStubAdapter: public SecondRootStubAdapter, public SecondRoot
             const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
             const std::shared_ptr<CommonAPI::StubBase>& stub);
 
-    ~SecondRootDBusStubAdapter();
+    ~SecondRootDBusStubAdapterInternal();
+
 
 
-    
     bool registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub>, const std::string&);
     bool deregisterManagedStubLeafInterface(const std::string&);
     std::set<std::string>& getLeafInterfaceInstances();
 
-    const StubDispatcherTable& getStubDispatcherTable();
-    
+    const SecondRootDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+
     void deactivateManagedInstances();
 
+
  protected:
     virtual const char* getMethodsDBusIntrospectionXmlData() const;
     
   private:
     std::set<std::string> registeredLeafInterfaceInstances;
+    SecondRootDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+};
+
+class SecondRootDBusStubAdapter: public SecondRootDBusStubAdapterInternal, public std::enable_shared_from_this<SecondRootDBusStubAdapter> {
+public:
+    SecondRootDBusStubAdapter(
+                         const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+                         const std::string& commonApiAddress,
+                         const std::string& dbusInterfaceName,
+                         const std::string& dbusBusName,
+                         const std::string& dbusObjectPath,
+                         const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
+                         const std::shared_ptr<CommonAPI::StubBase>& stub) :
+            CommonAPI::DBus::DBusStubAdapter(
+                            factory,
+                            commonApiAddress,
+                            dbusInterfaceName,
+                            dbusBusName,
+                            dbusObjectPath,
+                            dbusConnection,
+                            true),
+            SecondRootDBusStubAdapterInternal(
+                            factory,
+                            commonApiAddress,
+                            dbusInterfaceName,
+                            dbusBusName,
+                            dbusObjectPath,
+                            dbusConnection,
+                            stub) { }
 };
 
 } // namespace managed