From 0ab141cbb209164973d9dc4177fd017291747468 Mon Sep 17 00:00:00 2001
From: "Christian R. G. Dreher" <c.dreher@kit.edu>
Date: Wed, 13 Jan 2021 14:00:33 +0100
Subject: [PATCH] refactor: Rename {Reading,Writing}Interface to
{Reading,Writing}MemoryInterface.
---
source/RobotAPI/interface/CMakeLists.txt | 4 ++--
source/RobotAPI/interface/armem.ice | 4 ++--
source/RobotAPI/interface/armem/MemoryInterface.ice | 6 +++---
.../{ReadingInterface.ice => ReadingMemoryInterface.ice} | 2 +-
.../{WritingInterface.ice => WritingMemoryInterface.ice} | 2 +-
source/RobotAPI/libraries/armem/client/QueryBuilder.h | 1 -
source/RobotAPI/libraries/armem/client/Reader.cpp | 4 ++--
source/RobotAPI/libraries/armem/client/Reader.h | 8 ++++----
.../libraries/armem/client/ReaderComponentPlugin.cpp | 2 +-
.../libraries/armem/client/ReaderComponentPlugin.h | 2 +-
source/RobotAPI/libraries/armem/client/Writer.cpp | 4 ++--
source/RobotAPI/libraries/armem/client/Writer.h | 8 ++++----
.../libraries/armem/client/WriterComponentPlugin.cpp | 2 +-
.../libraries/armem/client/WriterComponentPlugin.h | 2 +-
14 files changed, 25 insertions(+), 26 deletions(-)
rename source/RobotAPI/interface/armem/{ReadingInterface.ice => ReadingMemoryInterface.ice} (82%)
rename source/RobotAPI/interface/armem/{WritingInterface.ice => WritingMemoryInterface.ice} (97%)
diff --git a/source/RobotAPI/interface/CMakeLists.txt b/source/RobotAPI/interface/CMakeLists.txt
index 09a750210..47dce8075 100644
--- a/source/RobotAPI/interface/CMakeLists.txt
+++ b/source/RobotAPI/interface/CMakeLists.txt
@@ -103,8 +103,8 @@ set(SLICE_FILES
aron/Aron.ice
armem.ice
- armem/ReadingInterface.ice
- armem/WritingInterface.ice
+ armem/ReadingMemoryInterface.ice
+ armem/WritingMemoryInterface.ice
armem/MemoryInterface.ice
armem/MemoryListenerInterface.ice
armem/MemoryNameSystemInterface.ice
diff --git a/source/RobotAPI/interface/armem.ice b/source/RobotAPI/interface/armem.ice
index a01037e52..c86d4d5fb 100644
--- a/source/RobotAPI/interface/armem.ice
+++ b/source/RobotAPI/interface/armem.ice
@@ -1,7 +1,7 @@
#pragma once
-#include <RobotAPI/interface/armem/ReadingInterface.ice>
-#include <RobotAPI/interface/armem/WritingInterface.ice>
+#include <RobotAPI/interface/armem/ReadingMemoryInterface.ice>
+#include <RobotAPI/interface/armem/WritingMemoryInterface.ice>
#include <RobotAPI/interface/armem/MemoryInterface.ice>
#include <RobotAPI/interface/armem/MemoryListenerInterface.ice>
diff --git a/source/RobotAPI/interface/armem/MemoryInterface.ice b/source/RobotAPI/interface/armem/MemoryInterface.ice
index 90be8cb27..b44718d22 100644
--- a/source/RobotAPI/interface/armem/MemoryInterface.ice
+++ b/source/RobotAPI/interface/armem/MemoryInterface.ice
@@ -1,7 +1,7 @@
#pragma once
-#include <RobotAPI/interface/armem/ReadingInterface.ice>
-#include <RobotAPI/interface/armem/WritingInterface.ice>
+#include <RobotAPI/interface/armem/ReadingMemoryInterface.ice>
+#include <RobotAPI/interface/armem/WritingMemoryInterface.ice>
module armarx
@@ -9,7 +9,7 @@ module armarx
module armem
{
- interface MemoryInterface extends ReadingInterface, WritingInterface
+ interface MemoryInterface extends ReadingMemoryInterface, WritingMemoryInterface
{
};
diff --git a/source/RobotAPI/interface/armem/ReadingInterface.ice b/source/RobotAPI/interface/armem/ReadingMemoryInterface.ice
similarity index 82%
rename from source/RobotAPI/interface/armem/ReadingInterface.ice
rename to source/RobotAPI/interface/armem/ReadingMemoryInterface.ice
index a50056efb..e38e3dc44 100644
--- a/source/RobotAPI/interface/armem/ReadingInterface.ice
+++ b/source/RobotAPI/interface/armem/ReadingMemoryInterface.ice
@@ -8,7 +8,7 @@ module armarx
module armem
{
- interface ReadingInterface
+ interface ReadingMemoryInterface
{
data::QueryResult query(data::QueryInput input);
};
diff --git a/source/RobotAPI/interface/armem/WritingInterface.ice b/source/RobotAPI/interface/armem/WritingMemoryInterface.ice
similarity index 97%
rename from source/RobotAPI/interface/armem/WritingInterface.ice
rename to source/RobotAPI/interface/armem/WritingMemoryInterface.ice
index 902e80dde..8d586054d 100644
--- a/source/RobotAPI/interface/armem/WritingInterface.ice
+++ b/source/RobotAPI/interface/armem/WritingMemoryInterface.ice
@@ -61,7 +61,7 @@ module armarx
}
- interface WritingInterface
+ interface WritingMemoryInterface
{
/// Register multiple core or provider segments.
data::AddSegmentsResult addSegments(data::AddSegmentsInput input);
diff --git a/source/RobotAPI/libraries/armem/client/QueryBuilder.h b/source/RobotAPI/libraries/armem/client/QueryBuilder.h
index dcfd855cc..2e38d0986 100644
--- a/source/RobotAPI/libraries/armem/client/QueryBuilder.h
+++ b/source/RobotAPI/libraries/armem/client/QueryBuilder.h
@@ -1,7 +1,6 @@
#pragma once
#include <RobotAPI/interface/armem/query.h>
-#include <RobotAPI/interface/armem/ReadingInterface.h>
#include "../core/DataMode.h"
#include "Query.h"
diff --git a/source/RobotAPI/libraries/armem/client/Reader.cpp b/source/RobotAPI/libraries/armem/client/Reader.cpp
index e0869b987..558703dcc 100644
--- a/source/RobotAPI/libraries/armem/client/Reader.cpp
+++ b/source/RobotAPI/libraries/armem/client/Reader.cpp
@@ -9,7 +9,7 @@
namespace armarx::armem::client
{
- Reader::Reader(ReadingInterfacePrx memory) : memory(memory)
+ Reader::Reader(ReadingMemoryInterfacePrx memory) : memory(memory)
{
}
@@ -112,7 +112,7 @@ namespace armarx::armem::client
void
- Reader::setReadingMemory(ReadingInterfacePrx memory)
+ Reader::setReadingMemory(ReadingMemoryInterfacePrx memory)
{
this->memory = memory;
}
diff --git a/source/RobotAPI/libraries/armem/client/Reader.h b/source/RobotAPI/libraries/armem/client/Reader.h
index fe293ddba..2a7e4f4c1 100644
--- a/source/RobotAPI/libraries/armem/client/Reader.h
+++ b/source/RobotAPI/libraries/armem/client/Reader.h
@@ -7,7 +7,7 @@
#include <vector>
// RobotAPI
-#include <RobotAPI/interface/armem/ReadingInterface.h>
+#include <RobotAPI/interface/armem/ReadingMemoryInterface.h>
#include <RobotAPI/interface/armem/MemoryListenerInterface.h>
#include <RobotAPI/libraries/armem/core/ice_conversions.h>
#include <RobotAPI/libraries/armem/memory/Memory.h>
@@ -32,7 +32,7 @@ namespace armarx::armem::client
* @brief Construct a memory reader.
* @param memory The memory proxy.
*/
- Reader(ReadingInterfacePrx memory = nullptr);
+ Reader(ReadingMemoryInterfacePrx memory = nullptr);
QueryResult query(const QueryInput& input);
@@ -50,7 +50,7 @@ namespace armarx::armem::client
void subscribe(const MemoryID& entityID, callback callback);
- void setReadingMemory(ReadingInterfacePrx memory);
+ void setReadingMemory(ReadingMemoryInterfacePrx memory);
operator bool() const
{
@@ -59,7 +59,7 @@ namespace armarx::armem::client
public:
- ReadingInterfacePrx memory;
+ ReadingMemoryInterfacePrx memory;
private:
diff --git a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
index d7eeff0fe..fca6d9442 100644
--- a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
@@ -45,7 +45,7 @@ armarx::armem::client::ReaderComponentPluginUser::memoryUpdated(
void
-armarx::armem::client::ReaderComponentPluginUser::setReadingMemory(ReadingInterfacePrx memory)
+armarx::armem::client::ReaderComponentPluginUser::setReadingMemory(ReadingMemoryInterfacePrx memory)
{
memoryReader.setReadingMemory(memory);
}
diff --git a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
index 66c3cd363..4ed9bea8f 100644
--- a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
@@ -49,7 +49,7 @@ namespace armarx::armem::client
protected:
- void setReadingMemory(ReadingInterfacePrx memory);
+ void setReadingMemory(ReadingMemoryInterfacePrx memory);
protected:
diff --git a/source/RobotAPI/libraries/armem/client/Writer.cpp b/source/RobotAPI/libraries/armem/client/Writer.cpp
index c7a14a15d..f50622117 100644
--- a/source/RobotAPI/libraries/armem/client/Writer.cpp
+++ b/source/RobotAPI/libraries/armem/client/Writer.cpp
@@ -8,7 +8,7 @@
namespace armarx::armem::client
{
- Writer::Writer(WritingInterfacePrx memory) : memory(memory)
+ Writer::Writer(WritingMemoryInterfacePrx memory) : memory(memory)
{
}
@@ -108,7 +108,7 @@ namespace armarx::armem::client
void
- Writer::setWritingMemory(WritingInterfacePrx memory)
+ Writer::setWritingMemory(WritingMemoryInterfacePrx memory)
{
this->memory = memory;
}
diff --git a/source/RobotAPI/libraries/armem/client/Writer.h b/source/RobotAPI/libraries/armem/client/Writer.h
index 7ed6e44a3..67e7f57d0 100644
--- a/source/RobotAPI/libraries/armem/client/Writer.h
+++ b/source/RobotAPI/libraries/armem/client/Writer.h
@@ -1,6 +1,6 @@
#pragma once
-#include <RobotAPI/interface/armem/WritingInterface.h>
+#include <RobotAPI/interface/armem/WritingMemoryInterface.h>
#include <RobotAPI/libraries/armem/core/ice_conversions.h>
@@ -19,7 +19,7 @@ namespace armarx::armem::client
* @brief Construct a memory writer.
* @param memory The memory proxy.
*/
- Writer(WritingInterfacePrx memory = nullptr);
+ Writer(WritingMemoryInterfacePrx memory = nullptr);
data::AddSegmentResult addSegment(const std::string& coreSegmentName, const std::string& providerSegmentName);
@@ -33,7 +33,7 @@ namespace armarx::armem::client
EntityUpdateResult commit(const EntityUpdate& update);
- void setWritingMemory(WritingInterfacePrx memory);
+ void setWritingMemory(WritingMemoryInterfacePrx memory);
operator bool() const
{
@@ -46,7 +46,7 @@ namespace armarx::armem::client
public:
- WritingInterfacePrx memory;
+ WritingMemoryInterfacePrx memory;
};
diff --git a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
index f5c648090..5ed4dc1f7 100644
--- a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
@@ -27,7 +27,7 @@ armarx::armem::client::WriterComponentPluginUser::~WriterComponentPluginUser()
void
-armarx::armem::client::WriterComponentPluginUser::setWritingMemory(WritingInterfacePrx memory)
+armarx::armem::client::WriterComponentPluginUser::setWritingMemory(WritingMemoryInterfacePrx memory)
{
memoryWriter.setWritingMemory(memory);
}
diff --git a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
index f93c9a230..4f3eeb3bd 100644
--- a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
@@ -38,7 +38,7 @@ namespace armarx::armem::client
protected:
- void setWritingMemory(WritingInterfacePrx memory);
+ void setWritingMemory(WritingMemoryInterfacePrx memory);
protected:
--
GitLab