Merge branch 'armem/memory' into armem/client-query

# Conflicts:
#	source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp
#	source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h
#	source/RobotAPI/libraries/armem/CMakeLists.txt
#	source/RobotAPI/libraries/armem/client/Reader.cpp
#	source/RobotAPI/libraries/armem/client/Reader.h
#	source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
#	source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
#	source/RobotAPI/libraries/armem/test/CMakeLists.txt

source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp

@@ -28,8 +28,6 @@
 #include <RobotAPI/interface/aron.h>
 
 #include <RobotAPI/libraries/armem/component/MemoryRemoteGui.h>
-#include <RobotAPI/libraries/armem/client/Writer.h>
-#include <RobotAPI/libraries/armem/client/Reader.h>
 #include <RobotAPI/libraries/armem/client/QueryBuilder.h>
 #include <RobotAPI/libraries/armem/memory/ice_conversions.h>
 
@@ -240,11 +238,6 @@ namespace armarx
         }
     }
 
-    void ArMemExampleClient::example_entityUpdated(const armem::MemoryID& id)
-    {
-        ARMARX_IMPORTANT << "############### example_entity got updated: " << id << " ##################";
-        // Fetch new data of example_entity and do something with it.
-    }
 
     void ArMemExampleClient::waitForMemory()
     {
@@ -405,6 +398,14 @@ namespace armarx
     }
 
 
+
+    void ArMemExampleClient::example_entityUpdated(const armem::MemoryID& id)
+    {
+        ARMARX_IMPORTANT << "example_entity got updated: " << id;
+        // Fetch new data of example_entity and do something with it.
+    }
+
+
     void ArMemExampleClient::createRemoteGuiTab()
     {
         using namespace armarx::RemoteGui::Client;

source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h

@@ -31,7 +31,6 @@
 #include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
 
 // RobotAPI
-//#include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
 #include <RobotAPI/interface/armem/MemoryInterface.h>
 #include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
 #include <RobotAPI/libraries/armem/client/ComponentPlugin.h>

source/RobotAPI/libraries/armem/CMakeLists.txt

@@ -42,12 +42,12 @@ set(LIB_FILES
     mns/MemoryNameSystemComponentPlugin.cpp
 
     client/ComponentPlugin.cpp
-    client/Query.cpp
     client/Reader.cpp
     client/ReaderComponentPlugin.cpp
     client/Writer.cpp
     client/WriterComponentPlugin.cpp
 
+    client/Query.cpp
     client/QueryBuilder.cpp
     client/query/selectors.cpp
 
@@ -93,12 +93,12 @@ set(LIB_HEADERS
     mns/MemoryNameSystemComponentPlugin.h
 
     client/ComponentPlugin.h
-    client/Query.h
     client/Reader.h
     client/ReaderComponentPlugin.h
     client/Writer.h
     client/WriterComponentPlugin.h
 
+    client/Query.h
     client/QueryBuilder.h
     client/query/NameSelectorOps.h
     client/query/SelectorOps.h

source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp

@@ -35,9 +35,10 @@ armarx::armem::client::ReaderComponentPluginUser::~ReaderComponentPluginUser()
 
 
 void
-armarx::armem::client::ReaderComponentPluginUser::memoryUpdated(const std::vector<data::MemoryID>& updatedIDsIce, const Ice::Current&)
+armarx::armem::client::ReaderComponentPluginUser::memoryUpdated(
+    const std::vector<data::MemoryID>& updatedSnapshotIDsIce, const Ice::Current&)
 {
-    std::vector<MemoryID> updatedIDs;
-    fromIce(updatedIDsIce, updatedIDs);
-    memoryReader.updated(updatedIDs);
+    std::vector<MemoryID> updatedSnapshotIDs;
+    fromIce(updatedSnapshotIDsIce, updatedSnapshotIDs);
+    memoryReader.updated(updatedSnapshotIDs);
 }

source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h

@@ -43,7 +43,8 @@ namespace armarx::armem::client
         ReaderComponentPluginUser();
         ~ReaderComponentPluginUser() override;
 
-        virtual void memoryUpdated(const std::vector<data::MemoryID>& updatedIDs, const Ice::Current& current) override;
+
+        virtual void memoryUpdated(const std::vector<data::MemoryID>& updatedSnapshotIDs, const Ice::Current& current) override;
 
 
     protected: