Changeset 902 for code/branches/core2/src/orxonox/core

Timestamp:

Mar 19, 2008, 8:43:36 PM (17 years ago)

Author:

landauf

Message:

using "XMLPort::Mode mode" instead of "bool loading" in all XMLPort functions

Location:

code/branches/core2/src/orxonox/core

Files:

• BaseObject.cc (modified) (1 diff)
• BaseObject.h (modified) (1 diff)
• CorePrereqs.h (modified) (1 diff)
• Loader.cc (modified) (1 diff)
• Namespace.cc (modified) (3 diffs)
• Namespace.h (modified) (1 diff)
• XMLPort.h (modified) (5 diffs)

code/branches/core2/src/orxonox/core/BaseObject.cc

@@ -79 +79 @@
         @return The XML-element
     */
-    void BaseObject::XMLPort(Element& xmlelement, bool loading)
+    void BaseObject::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        XMLPortParam(BaseObject, "name", setName, getName, xmlelement, loading);
+        XMLPortParam(BaseObject, "name", setName, getName, xmlelement, mode);
     }
 

code/branches/core2/src/orxonox/core/BaseObject.h

@@ -50 +50 @@
             virtual ~BaseObject();
             virtual void loadParams(TiXmlElement* xmlElem);
-            virtual void XMLPort(Element& xmlelement, bool loading);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
             /** @brief Sets the name of the object. @param name The name */

code/branches/core2/src/orxonox/core/CorePrereqs.h

@@ -65 +65 @@
 namespace orxonox
 {
+#ifndef _XMLPort_Mode__
+#define _XMLPort_Mode__
+  namespace XMLPort
+  {
+    enum Mode
+    {
+      LoadObject,
+      SaveObject
+    };
+  }
+#endif
+
   typedef std::string LanguageEntryLabel;
 

code/branches/core2/src/orxonox/core/Loader.cc

@@ -129 +129 @@
             rootNamespace->setNamespace(rootNamespace);
             rootNamespace->setRoot(true);
-            rootNamespace->XMLPort(rootElement, true);
+            rootNamespace->XMLPort(rootElement, XMLPort::LoadObject);
 
             COUT(0) << "Finished loading " << level->getFile() << "." << std::endl;

code/branches/core2/src/orxonox/core/Namespace.cc

@@ -58 +58 @@
         @return The XML-element
     */
-    void Namespace::XMLPort(Element& xmlelement, bool loading)
+    void Namespace::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        BaseObject::XMLPort(xmlelement, loading);
+        BaseObject::XMLPort(xmlelement, mode);
 
         std::string name = this->getName();
@@ -89 +89 @@
         }
 
-        XMLPortParam(Namespace, "operator", setOperator, getOperator, xmlelement, loading);
-        XMLPortParam(Namespace, "bAutogenerated", setAutogenerated, isAutogenerated, xmlelement, loading);
+        XMLPortParam(Namespace, "operator", setOperator, getOperator, xmlelement, mode);
+        XMLPortParam(Namespace, "bAutogenerated", setAutogenerated, isAutogenerated, xmlelement, mode);
 
         if (this->bAutogeneratedFileRootNamespace_)
@@ -101 +101 @@
         }
 
-        XMLPortObject(Namespace, BaseObject, "", loadObjects, saveObjects, xmlelement, loading, true, false);
+        XMLPortObject(Namespace, BaseObject, "", loadObjects, saveObjects, xmlelement, mode, true, false);
     }
 

code/branches/core2/src/orxonox/core/Namespace.h

@@ -44 +44 @@
             virtual ~Namespace();
 
-            virtual void XMLPort(Element& xmlelement, bool loading);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
             void loadObjects(BaseObject* object);

code/branches/core2/src/orxonox/core/XMLPort.h

@@ -75 +75 @@
 namespace orxonox
 {
+
+#ifndef _XMLPort_Mode__
+#define _XMLPort_Mode__
+    namespace XMLPort
+    {
+        enum Mode
+        {
+            LoadObject,
+            SaveObject
+        };
+    }
+#endif
+
     // ###############################
     // ###  XMLPortParamContainer  ###
@@ -123 +136 @@
             }
 
-            XMLPortParamContainer& port(T* object, Element& xmlelement, bool loading)
-            {
-                if (loading)
+            XMLPortParamContainer& port(T* object, Element& xmlelement, XMLPort::Mode mode)
+            {
+                if (mode == XMLPort::LoadObject)
                 {
                     try
@@ -227 +240 @@
             }
 
-            XMLPortObjectContainer& port(T* object, Element& xmlelement, bool loading)
-            {
-                if (loading)
+            XMLPortObjectContainer& port(T* object, Element& xmlelement, XMLPort::Mode mode)
+            {
+                if (mode == XMLPort::LoadObject)
                 {
                     try
@@ -257 +270 @@
                                             if (this->bLoadBefore_)
                                             {
-                                                newObject->XMLPort(*child, true);
+                                                newObject->XMLPort(*child, XMLPort::LoadObject);
                                                 COUT(4) << object->getLoaderIndentation() << "assigning " << child->Value() << " (objectname " << newObject->getName() << ") to " << this->classname_ << " (objectname " << object->getName() << ")" << std::endl;
                                             }
@@ -266 +279 @@
                                             (*object.*this->loadfunction_)(newObject);
                                             if (!this->bLoadBefore_)
-                                                newObject->XMLPort(*child, true);
+                                                newObject->XMLPort(*child, XMLPort::LoadObject);
                                             COUT(5) << object->getLoaderIndentation() << "...fabricated " << child->Value() << " (objectname " << newObject->getName() << ")." << std::endl;
                                         }