Changeset 879 for code/branches/core2/src/orxonox/core/Namespace.cc

Timestamp:

Mar 10, 2008, 5:07:48 PM (16 years ago)

Author:

landauf

Message:

started implementing the Namespace hierarchy (still unfinished)

File:

• code/branches/core2/src/orxonox/core/Namespace.cc (modified) (2 diffs)

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

@@ -38 +38 @@
         RegisterObject(Namespace);
 
-        this->representingNamespace_ = 0;
+        this->representingNamespace_ = this;
     }
 
@@ -55 +55 @@
         BaseObject::XMLPort(xmlelement, loading);
 
-        XMLPortObject(Namespace, BaseObject, "", loadObjects, saveObjects, xmlelement, loading, true);
+        XMLPortObject(Namespace, BaseObject, "", loadObjects, saveObjects, xmlelement, loading, true, false);
     }
 
     void Namespace::loadObjects(BaseObject* object)
     {
-        object->setNamespace(this);
+        object->setNamespace(this->representingNamespace_);
+
+        if (object->isA(Class(Namespace)))
+            this->addSubnamespace((Namespace*)object);
+    }
+
+    void Namespace::addSubnamespace(Namespace* ns)
+    {
+        std::string name = ns->getName().substr(ns->getName().find("::"
+
+        if (!this->hasSubnamespace(ns->getName()))
+            this->namespaces_[ns->getName()] = ns;
+        else
+            ns->representingNamespace_ = object;
+    }
+
+    bool Namespace::hasSubnamespace(const std::string& name) const
+    {
+        return (this->namespaces_.find(name) != this->namespaces_.end());
     }