Browse Source

Small changes in xml serialization

Former-commit-id: e59f2543ceb126fa4af2f445d185a46bf83e4976
schuellc 11 years ago
parent
commit
2b4921a614

+ 1 - 1
include/igl/xml/XMLSerializable.h

@@ -7,7 +7,7 @@
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
 /* ---------------------------------------------------------------------------
 /* ---------------------------------------------------------------------------
  // XMLSerializable.h
  // XMLSerializable.h
- // Author: Christian Schüller on 19/11/13.
+ // Author: Christian Schüller <schuellchr@gmail.com>
  ------------------------------------------------------------------------------
  ------------------------------------------------------------------------------
  Inherit from this abstract class to have full control over the serialization
  Inherit from this abstract class to have full control over the serialization
  of your user defined class.
  of your user defined class.

+ 27 - 28
include/igl/xml/XMLSerialization.h

@@ -7,7 +7,7 @@
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
 /* ---------------------------------------------------------------------------
 /* ---------------------------------------------------------------------------
  // XMLSerialization.h
  // XMLSerialization.h
- // Author: Christian Schüller on 19/11/13.
+ // Author: Christian Schüller <schuellchr@gmail.com>
  ------------------------------------------------------------------------------
  ------------------------------------------------------------------------------
  Inherit from this class to have the easiest way to serialize your user defined class.
  Inherit from this class to have the easiest way to serialize your user defined class.
  
  
@@ -16,8 +16,8 @@
  xmlSerializer->Add(var1,"name1");
  xmlSerializer->Add(var1,"name1");
  xmlSerializer->Add(var2,"name2");
  xmlSerializer->Add(var2,"name2");
 
 
- Workaround for Visual Studio run time debugger inspection problem.
- Copy and implement all the functions, splitting into a source and header file.
+ Workaround for Visual Studio run time debugger inspection problem:
+ Copy and implement all the functions, splitting them into a source and header file.
  Restrictions on Native C++ Expressions (Anonymous Namespaces):
  Restrictions on Native C++ Expressions (Anonymous Namespaces):
  http://msdn.microsoft.com/en-us/library/0888kc6a%28VS.80%29.aspx
  http://msdn.microsoft.com/en-us/library/0888kc6a%28VS.80%29.aspx
  ----------------------------------------------------------------------------*/
  ----------------------------------------------------------------------------*/
@@ -36,14 +36,14 @@ namespace igl
     {
     {
     public:
     public:
       XMLSerializer* xmlSerializer;
       XMLSerializer* xmlSerializer;
-      
+
       /**
       /**
        * Default implementation of XMLSerializable interface
        * Default implementation of XMLSerializable interface
        */
        */
       virtual void Init();
       virtual void Init();
-      virtual bool Serialize(tinyxml2::XMLDocument* doc, tinyxml2::XMLElement* element);
-      virtual bool Deserialize(tinyxml2::XMLDocument* doc, const tinyxml2::XMLElement* element);
-      
+      virtual bool Serialize(tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element);
+      virtual bool Deserialize(tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element);
+
       /**
       /**
       * Default constructor, destructor, assignment and copy constructor
       * Default constructor, destructor, assignment and copy constructor
       */
       */
@@ -51,7 +51,7 @@ namespace igl
       ~XMLSerialization();
       ~XMLSerialization();
       XMLSerialization(const XMLSerialization& obj);
       XMLSerialization(const XMLSerialization& obj);
       XMLSerialization& operator=(const XMLSerialization& obj);
       XMLSerialization& operator=(const XMLSerialization& obj);
-      
+
       /**
       /**
       * Function which must be overriden in the subclass if you dont use
       * Function which must be overriden in the subclass if you dont use
       * heap allocations (new) to create new instances.
       * heap allocations (new) to create new instances.
@@ -83,14 +83,14 @@ namespace igl
     void XMLSerialization::Init()
     void XMLSerialization::Init()
     {
     {
     }
     }
-    
-    bool XMLSerialization::Serialize(tinyxml2::XMLDocument* doc, tinyxml2::XMLElement* element)
+
+    bool XMLSerialization::Serialize(tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element)
     {
     {
       bool serialized = false;
       bool serialized = false;
-      
+
       if(this->BeforeSerialization())
       if(this->BeforeSerialization())
       {
       {
-        if(xmlSerializer == NULL)
+        if(xmlSerializer==NULL)
         {
         {
           xmlSerializer = new XMLSerializer(Name);
           xmlSerializer = new XMLSerializer(Name);
           this->InitSerialization();
           this->InitSerialization();
@@ -98,17 +98,17 @@ namespace igl
         serialized = xmlSerializer->SaveGroupToXMLElement(doc,element,Name);
         serialized = xmlSerializer->SaveGroupToXMLElement(doc,element,Name);
         this->AfterSerialization();
         this->AfterSerialization();
       }
       }
-      
+
       return serialized;
       return serialized;
     }
     }
-    
-    bool XMLSerialization::Deserialize(tinyxml2::XMLDocument* doc, const tinyxml2::XMLElement* element)
+
+    bool XMLSerialization::Deserialize(tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element)
     {
     {
       bool serialized = false;
       bool serialized = false;
-      
+
       if(this->BeforeDeserialization())
       if(this->BeforeDeserialization())
       {
       {
-        if(xmlSerializer == NULL)
+        if(xmlSerializer==NULL)
         {
         {
           xmlSerializer = new XMLSerializer(Name);
           xmlSerializer = new XMLSerializer(Name);
           this->InitSerialization();
           this->InitSerialization();
@@ -116,16 +116,16 @@ namespace igl
         serialized = xmlSerializer->LoadGroupFromXMLElement(Name,doc,element);
         serialized = xmlSerializer->LoadGroupFromXMLElement(Name,doc,element);
         this->AfterDeserialization();
         this->AfterDeserialization();
       }
       }
-      
+
       return serialized;
       return serialized;
     }
     }
 
 
     void XMLSerialization::InitSerialization()
     void XMLSerialization::InitSerialization()
     {
     {
-      std::cout << "You have to override InitSerialization()" << "\n";
+      std::cout<<"You have to override InitSerialization()"<<"\n";
       //assert(false);
       //assert(false);
     }
     }
-    
+
     XMLSerialization::XMLSerialization(const std::string& name)
     XMLSerialization::XMLSerialization(const std::string& name)
     {
     {
       Name = name;
       Name = name;
@@ -134,7 +134,7 @@ namespace igl
 
 
     XMLSerialization::~XMLSerialization()
     XMLSerialization::~XMLSerialization()
     {
     {
-      if(xmlSerializer != NULL)
+      if(xmlSerializer!=NULL)
         delete xmlSerializer;
         delete xmlSerializer;
       xmlSerializer = NULL;
       xmlSerializer = NULL;
     }
     }
@@ -147,10 +147,10 @@ namespace igl
 
 
     XMLSerialization& XMLSerialization::operator=(const XMLSerialization& obj)
     XMLSerialization& XMLSerialization::operator=(const XMLSerialization& obj)
     {
     {
-      if(this != &obj)
+      if(this!=&obj)
       {
       {
         Name = obj.Name;
         Name = obj.Name;
-        if(xmlSerializer != NULL)
+        if(xmlSerializer!=NULL)
         {
         {
           delete xmlSerializer;
           delete xmlSerializer;
           xmlSerializer = NULL;
           xmlSerializer = NULL;
@@ -158,26 +158,25 @@ namespace igl
       }
       }
       return *this;
       return *this;
     }
     }
-    
+
     bool XMLSerialization::BeforeSerialization()
     bool XMLSerialization::BeforeSerialization()
     {
     {
       return true;
       return true;
     }
     }
-    
+
     void XMLSerialization::AfterSerialization()
     void XMLSerialization::AfterSerialization()
     {
     {
     }
     }
-    
+
     bool XMLSerialization::BeforeDeserialization()
     bool XMLSerialization::BeforeDeserialization()
     {
     {
       return true;
       return true;
     }
     }
-    
+
     void XMLSerialization::AfterDeserialization()
     void XMLSerialization::AfterDeserialization()
     {
     {
     }
     }
   }
   }
-
 }
 }
 
 
 #endif
 #endif

+ 1 - 1
include/igl/xml/XMLSerializationTest.h

@@ -7,7 +7,7 @@
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
 /* ---------------------------------------------------------------------------
 /* ---------------------------------------------------------------------------
 // XMLSerializationTest.h
 // XMLSerializationTest.h
-// Author: Christian Schüller on 19/11/13.
+// Author: Christian Schüller <schuellchr@gmail.com>
 ------------------------------------------------------------------------------
 ------------------------------------------------------------------------------
  Used to demonstrates howto use the XMLSerialization class.
  Used to demonstrates howto use the XMLSerialization class.
 ----------------------------------------------------------------------------*/
 ----------------------------------------------------------------------------*/

+ 1 - 1
include/igl/xml/XMLSerializer.h.REMOVED.git-id

@@ -1 +1 @@
-ef40e013b092c2c55d5032d93ad436ea05230a88
+93e0bbee01493dd152cbb28f43f01c6c0da7dd52