From 1bbf377492c46c14c2c82f4dd0941814d50d710b Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Tue, 4 Oct 2016 10:29:12 +0200
Subject: [PATCH] move containers and factory from data to common

---
 {alib2data => alib2common}/src/container/Container.cpp      | 0
 {alib2data => alib2common}/src/container/Container.h        | 0
 {alib2data => alib2common}/src/container/ContainerBase.h    | 0
 {alib2data => alib2common}/src/container/ContainerClasses.h | 0
 .../src/container/ContainerFeatures.h                       | 0
 {alib2data => alib2common}/src/container/ObjectsDeque.cpp   | 0
 {alib2data => alib2common}/src/container/ObjectsDeque.h     | 0
 {alib2data => alib2common}/src/container/ObjectsList.cpp    | 0
 {alib2data => alib2common}/src/container/ObjectsList.h      | 0
 {alib2data => alib2common}/src/container/ObjectsMap.cpp     | 0
 {alib2data => alib2common}/src/container/ObjectsMap.h       | 0
 {alib2data => alib2common}/src/container/ObjectsPair.cpp    | 0
 {alib2data => alib2common}/src/container/ObjectsPair.h      | 0
 {alib2data => alib2common}/src/container/ObjectsSet.cpp     | 0
 {alib2data => alib2common}/src/container/ObjectsSet.h       | 0
 {alib2data => alib2common}/src/container/ObjectsTree.cpp    | 0
 {alib2data => alib2common}/src/container/ObjectsTree.h      | 0
 {alib2data => alib2common}/src/container/ObjectsTuple.h     | 0
 {alib2data => alib2common}/src/container/ObjectsVariant.h   | 0
 {alib2data => alib2common}/src/container/ObjectsVector.cpp  | 0
 {alib2data => alib2common}/src/container/ObjectsVector.h    | 0
 {alib2data => alib2common}/src/factory/XmlDataFactory.hpp   | 0
 .../test-src/container/ContainerTest.cpp                    | 5 ++---
 .../test-src/container/ContainerTest.h                      | 0
 alib2data/src/label/LR0ItemsLabel.cpp                       | 6 +++---
 25 files changed, 5 insertions(+), 6 deletions(-)
 rename {alib2data => alib2common}/src/container/Container.cpp (100%)
 rename {alib2data => alib2common}/src/container/Container.h (100%)
 rename {alib2data => alib2common}/src/container/ContainerBase.h (100%)
 rename {alib2data => alib2common}/src/container/ContainerClasses.h (100%)
 rename {alib2data => alib2common}/src/container/ContainerFeatures.h (100%)
 rename {alib2data => alib2common}/src/container/ObjectsDeque.cpp (100%)
 rename {alib2data => alib2common}/src/container/ObjectsDeque.h (100%)
 rename {alib2data => alib2common}/src/container/ObjectsList.cpp (100%)
 rename {alib2data => alib2common}/src/container/ObjectsList.h (100%)
 rename {alib2data => alib2common}/src/container/ObjectsMap.cpp (100%)
 rename {alib2data => alib2common}/src/container/ObjectsMap.h (100%)
 rename {alib2data => alib2common}/src/container/ObjectsPair.cpp (100%)
 rename {alib2data => alib2common}/src/container/ObjectsPair.h (100%)
 rename {alib2data => alib2common}/src/container/ObjectsSet.cpp (100%)
 rename {alib2data => alib2common}/src/container/ObjectsSet.h (100%)
 rename {alib2data => alib2common}/src/container/ObjectsTree.cpp (100%)
 rename {alib2data => alib2common}/src/container/ObjectsTree.h (100%)
 rename {alib2data => alib2common}/src/container/ObjectsTuple.h (100%)
 rename {alib2data => alib2common}/src/container/ObjectsVariant.h (100%)
 rename {alib2data => alib2common}/src/container/ObjectsVector.cpp (100%)
 rename {alib2data => alib2common}/src/container/ObjectsVector.h (100%)
 rename {alib2data => alib2common}/src/factory/XmlDataFactory.hpp (100%)
 rename {alib2data => alib2common}/test-src/container/ContainerTest.cpp (92%)
 rename {alib2data => alib2common}/test-src/container/ContainerTest.h (100%)

diff --git a/alib2data/src/container/Container.cpp b/alib2common/src/container/Container.cpp
similarity index 100%
rename from alib2data/src/container/Container.cpp
rename to alib2common/src/container/Container.cpp
diff --git a/alib2data/src/container/Container.h b/alib2common/src/container/Container.h
similarity index 100%
rename from alib2data/src/container/Container.h
rename to alib2common/src/container/Container.h
diff --git a/alib2data/src/container/ContainerBase.h b/alib2common/src/container/ContainerBase.h
similarity index 100%
rename from alib2data/src/container/ContainerBase.h
rename to alib2common/src/container/ContainerBase.h
diff --git a/alib2data/src/container/ContainerClasses.h b/alib2common/src/container/ContainerClasses.h
similarity index 100%
rename from alib2data/src/container/ContainerClasses.h
rename to alib2common/src/container/ContainerClasses.h
diff --git a/alib2data/src/container/ContainerFeatures.h b/alib2common/src/container/ContainerFeatures.h
similarity index 100%
rename from alib2data/src/container/ContainerFeatures.h
rename to alib2common/src/container/ContainerFeatures.h
diff --git a/alib2data/src/container/ObjectsDeque.cpp b/alib2common/src/container/ObjectsDeque.cpp
similarity index 100%
rename from alib2data/src/container/ObjectsDeque.cpp
rename to alib2common/src/container/ObjectsDeque.cpp
diff --git a/alib2data/src/container/ObjectsDeque.h b/alib2common/src/container/ObjectsDeque.h
similarity index 100%
rename from alib2data/src/container/ObjectsDeque.h
rename to alib2common/src/container/ObjectsDeque.h
diff --git a/alib2data/src/container/ObjectsList.cpp b/alib2common/src/container/ObjectsList.cpp
similarity index 100%
rename from alib2data/src/container/ObjectsList.cpp
rename to alib2common/src/container/ObjectsList.cpp
diff --git a/alib2data/src/container/ObjectsList.h b/alib2common/src/container/ObjectsList.h
similarity index 100%
rename from alib2data/src/container/ObjectsList.h
rename to alib2common/src/container/ObjectsList.h
diff --git a/alib2data/src/container/ObjectsMap.cpp b/alib2common/src/container/ObjectsMap.cpp
similarity index 100%
rename from alib2data/src/container/ObjectsMap.cpp
rename to alib2common/src/container/ObjectsMap.cpp
diff --git a/alib2data/src/container/ObjectsMap.h b/alib2common/src/container/ObjectsMap.h
similarity index 100%
rename from alib2data/src/container/ObjectsMap.h
rename to alib2common/src/container/ObjectsMap.h
diff --git a/alib2data/src/container/ObjectsPair.cpp b/alib2common/src/container/ObjectsPair.cpp
similarity index 100%
rename from alib2data/src/container/ObjectsPair.cpp
rename to alib2common/src/container/ObjectsPair.cpp
diff --git a/alib2data/src/container/ObjectsPair.h b/alib2common/src/container/ObjectsPair.h
similarity index 100%
rename from alib2data/src/container/ObjectsPair.h
rename to alib2common/src/container/ObjectsPair.h
diff --git a/alib2data/src/container/ObjectsSet.cpp b/alib2common/src/container/ObjectsSet.cpp
similarity index 100%
rename from alib2data/src/container/ObjectsSet.cpp
rename to alib2common/src/container/ObjectsSet.cpp
diff --git a/alib2data/src/container/ObjectsSet.h b/alib2common/src/container/ObjectsSet.h
similarity index 100%
rename from alib2data/src/container/ObjectsSet.h
rename to alib2common/src/container/ObjectsSet.h
diff --git a/alib2data/src/container/ObjectsTree.cpp b/alib2common/src/container/ObjectsTree.cpp
similarity index 100%
rename from alib2data/src/container/ObjectsTree.cpp
rename to alib2common/src/container/ObjectsTree.cpp
diff --git a/alib2data/src/container/ObjectsTree.h b/alib2common/src/container/ObjectsTree.h
similarity index 100%
rename from alib2data/src/container/ObjectsTree.h
rename to alib2common/src/container/ObjectsTree.h
diff --git a/alib2data/src/container/ObjectsTuple.h b/alib2common/src/container/ObjectsTuple.h
similarity index 100%
rename from alib2data/src/container/ObjectsTuple.h
rename to alib2common/src/container/ObjectsTuple.h
diff --git a/alib2data/src/container/ObjectsVariant.h b/alib2common/src/container/ObjectsVariant.h
similarity index 100%
rename from alib2data/src/container/ObjectsVariant.h
rename to alib2common/src/container/ObjectsVariant.h
diff --git a/alib2data/src/container/ObjectsVector.cpp b/alib2common/src/container/ObjectsVector.cpp
similarity index 100%
rename from alib2data/src/container/ObjectsVector.cpp
rename to alib2common/src/container/ObjectsVector.cpp
diff --git a/alib2data/src/container/ObjectsVector.h b/alib2common/src/container/ObjectsVector.h
similarity index 100%
rename from alib2data/src/container/ObjectsVector.h
rename to alib2common/src/container/ObjectsVector.h
diff --git a/alib2data/src/factory/XmlDataFactory.hpp b/alib2common/src/factory/XmlDataFactory.hpp
similarity index 100%
rename from alib2data/src/factory/XmlDataFactory.hpp
rename to alib2common/src/factory/XmlDataFactory.hpp
diff --git a/alib2data/test-src/container/ContainerTest.cpp b/alib2common/test-src/container/ContainerTest.cpp
similarity index 92%
rename from alib2data/test-src/container/ContainerTest.cpp
rename to alib2common/test-src/container/ContainerTest.cpp
index 9a32a49d79..f5652ce3b0 100644
--- a/alib2data/test-src/container/ContainerTest.cpp
+++ b/alib2common/test-src/container/ContainerTest.cpp
@@ -8,7 +8,6 @@
 #include "container/ObjectsSet.h"
 #include "container/ObjectsVariant.h"
 #include "container/ObjectsTree.h"
-#include "alphabet/LabeledSymbol.h"
 #include "primitive/Integer.h"
 #include "primitive/String.h"
 
@@ -28,7 +27,7 @@ void ContainerTest::tearDown ( ) {
 
 void ContainerTest::testXMLParser ( ) {
 
-	alib::Object tmp ( alphabet::LabeledSymbol ( "1" ) );
+	alib::Object tmp ( primitive::String ( "1" ) );
 
 	container::ObjectsSet set;
 
@@ -42,7 +41,7 @@ void ContainerTest::testXMLParser ( ) {
 
 		CPPUNIT_ASSERT ( object == object2 );
 
-		std::set < alphabet::LabeledSymbol > concrete = alib::XmlDataFactory::fromString < std::set < alphabet::LabeledSymbol > > ( tmp );
+		std::set < primitive::String > concrete = alib::XmlDataFactory::fromString < std::set < primitive::String > > ( tmp );
 		std::string tmp2 = alib::XmlDataFactory::toString ( concrete );
 
 		CPPUNIT_ASSERT ( tmp == tmp2 );
diff --git a/alib2data/test-src/container/ContainerTest.h b/alib2common/test-src/container/ContainerTest.h
similarity index 100%
rename from alib2data/test-src/container/ContainerTest.h
rename to alib2common/test-src/container/ContainerTest.h
diff --git a/alib2data/src/label/LR0ItemsLabel.cpp b/alib2data/src/label/LR0ItemsLabel.cpp
index 6b8a0a9c21..9d064605e5 100644
--- a/alib2data/src/label/LR0ItemsLabel.cpp
+++ b/alib2data/src/label/LR0ItemsLabel.cpp
@@ -11,9 +11,9 @@
 #include <object/Object.h>
 #include <core/xmlApi.hpp>
 #include "UniqueLabel.h"
-#include "../container/ObjectsMap.h"
-#include "../container/ObjectsSet.h"
-#include "../container/ObjectsVector.h"
+#include <container/ObjectsMap.h>
+#include <container/ObjectsSet.h>
+#include <container/ObjectsVector.h>
 #include <primitive/Unsigned.h>
 
 namespace label {
-- 
GitLab