Changeset 91:16104eff1b99 in finroc_plugins_runtime_construction

Timestamp:

14.05.2017 13:29:00 (6 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Changes tAdministrationService::DeleteUriConnector to be more suitable for use with finstruct

Files:

• tAdministrationService.cpp (modified) (2 diffs)
• tAdministrationService.h (modified) (1 diff)

tAdministrationService.cpp

@@ -302 +302 @@
 }
 
-bool tAdministrationService::DeleteUriConnector(int local_port_handle, const rrlib::uri::tURI& uri)
+bool tAdministrationService::DeleteUriConnector(int local_port_handle, uint index)
 {
   core::tAbstractPort* port = core::tRuntimeEnvironment::GetInstance().GetPort(local_port_handle);
@@ -308 +308 @@
   if (port && port->IsReady())
   {
-    for (auto & connector : port->UriConnectors())
-    {
-      if (connector->Uri() == uri)
-      {
-        connector->Disconnect();
-        return true;
-      }
-    }
-    result << "No connector with URI " << uri.ToString() << " found";
+    if (port->UriConnectors().size() > index && port->UriConnectors()[index])
+    {
+      port->UriConnectors()[index]->Disconnect();
+      return true;
+    }
+    result << "No URI connector with index " << index << " found";
   }
   else

tAdministrationService.h

@@ -154 +154 @@
    *
    * \param local_port_handle Handle of local owner port
-   * \param uri URI of partner port
+   * \param index Index of URI connector in owner port's list
    * \return Whether any connector was deleted
    */
-  bool DeleteUriConnector(int local_port_handle, const rrlib::uri::tURI& uri);
+  bool DeleteUriConnector(int local_port_handle, uint index);
 
   /*!