Skip to content
Snippets Groups Projects
Commit 0ab141cb authored by Christian Dreher's avatar Christian Dreher
Browse files

refactor: Rename {Reading,Writing}Interface to {Reading,Writing}MemoryInterface.

parent 9d757ed9
No related branches found
No related tags found
1 merge request!103refactor: Incorporate proposed refactorings
Showing
with 25 additions and 26 deletions
......@@ -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
......
#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>
......
#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
{
};
......
......@@ -8,7 +8,7 @@ module armarx
module armem
{
interface ReadingInterface
interface ReadingMemoryInterface
{
data::QueryResult query(data::QueryInput input);
};
......
......@@ -61,7 +61,7 @@ module armarx
}
interface WritingInterface
interface WritingMemoryInterface
{
/// Register multiple core or provider segments.
data::AddSegmentsResult addSegments(data::AddSegmentsInput input);
......
#pragma once
#include <RobotAPI/interface/armem/query.h>
#include <RobotAPI/interface/armem/ReadingInterface.h>
#include "../core/DataMode.h"
#include "Query.h"
......
......@@ -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;
}
......
......@@ -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:
......
......@@ -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);
}
......@@ -49,7 +49,7 @@ namespace armarx::armem::client
protected:
void setReadingMemory(ReadingInterfacePrx memory);
void setReadingMemory(ReadingMemoryInterfacePrx memory);
protected:
......
......@@ -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;
}
......
#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;
};
......
......@@ -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);
}
......@@ -38,7 +38,7 @@ namespace armarx::armem::client
protected:
void setWritingMemory(WritingInterfacePrx memory);
void setWritingMemory(WritingMemoryInterfacePrx memory);
protected:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment