registration: consolidate the registration code a bit

alib2data/src/PrimitiveRegistrator.cpp

@@ -2,7 +2,7 @@
 #include <registration/XmlRegistration.hpp>
 #include <registry/XmlContainerParserRegistry.hpp>
-#include <registry/ValuePrinterRegistry.hpp>
+#include <registration/ValuePrinterRegistration.hpp>
 #include <primitive/xml/UnsignedLong.h>
 #include <primitive/xml/Unsigned.h>
@@ -30,19 +30,16 @@ class PrimitiveRegistrator {
 	registration::XmlWriterRegister < ext::map < common::ranked_symbol < object::Object >, size_t > > member4;
 	registration::XmlWriterRegister < ext::set < string::LinearString < > > > member5;
 	registration::XmlWriterRegister < ext::trie < DefaultSymbolType, bool > > member6;
+	registration::XmlWriterRegister < ext::set < ext::pair < string::LinearString < >, unsigned int > > > member7;
+
+	registration::ValuePrinterRegister < ext::set < string::LinearString < > > > member8;
+	registration::ValuePrinterRegister < ext::set < ext::pair < string::LinearString < >, unsigned int > > > member9;
 public:
 	PrimitiveRegistrator ( ) {
 		abstraction::ContainerRegistry::registerSet < common::ranked_symbol < object::Object > > ( "RankedSymbol" );
 		abstraction::XmlContainerParserRegistry::registerSet < common::ranked_symbol < object::Object > > ( "RankedSymbol" );
-		registration::XmlWriterRegister < common::ranked_symbol < object::Object > > ( );
-		registration::XmlWriterRegister < ext::set < ext::pair < unsigned, unsigned > > > ( );
-		registration::XmlWriterRegister < ext::set < ext::pair < string::LinearString < >, unsigned int > > > ( );
-
-		abstraction::ValuePrinterRegistry::registerValuePrinter < ext::set < string::LinearString < > > > ( );
-		abstraction::ValuePrinterRegistry::registerValuePrinter < ext::set < ext::pair < string::LinearString < >, unsigned int > > > ( );
-
 		abstraction::XmlParserRegistry::registerXmlParser < object::Object > ( "DefaultStateType" );
 		core::xmlApi < object::Object >::template registerXmlWriter < ext::set < common::ranked_symbol < object::Object > > > ( );

alib2xml/src/PrimitiveRegistrator.cpp

@@ -27,6 +27,7 @@ class PrimitiveRegistrator {
 	registration::XmlWriterRegister < ext::set < int > > member6;
 	registration::XmlWriterRegister < ext::map < object::Object, size_t > > member7;
 	registration::XmlWriterRegister < object::Object > member8;
+	registration::XmlWriterRegister < ext::set < ext::pair < unsigned, unsigned > > > member9;
 public:
 	PrimitiveRegistrator ( ) {