Changeset 1036

Timestamp:

Apr 13, 2008, 1:36:45 AM (16 years ago)

Author:

landauf

Message:

added CoreSettings, a class containing all settings of core classes (at the moment it's only debuglevel and language)

removed DebugLevel
removed OrxonoxClass inheritance of Language and LanguageEntry

Location:

code/branches/core2/src/orxonox

Files:

• Orxonox.cc (modified) (2 diffs)
• core/CMakeLists.txt (modified) (1 diff)
• core/ConfigValueContainer.cc (modified) (1 diff)
• core/CorePrereqs.h (modified) (1 diff)
• core/CoreSettings.cc (added)
• core/CoreSettings.h (added)
• core/DebugLevel.cc (deleted)
• core/DebugLevel.h (deleted)
• core/Identifier.h (modified) (3 diffs)
• core/Language.cc (modified) (8 diffs)
• core/Language.h (modified) (4 diffs)
• core/OutputHandler.cc (modified) (2 diffs)

code/branches/core2/src/orxonox/Orxonox.cc

@@ -79 +79 @@
 #include "core/ClassTreeMask.h"
 #include "objects/WorldEntity.h"
-#include "core/DebugLevel.h"
 #include "core/BaseObject.h"
+#include "core/CoreSettings.h"
 #include "objects/Test.h"
 #include "objects/test1.h"
@@ -1125 +1125 @@
 
         ClassTreeMask test13_20;
-        test13_20.exclude(Class(DebugLevel));
-        std::cout << std::endl;
-        std::cout << "Mask with excluded DebugLevel:\n";
+        test13_20.exclude(Class(CoreSettings));
+        std::cout << std::endl;
+        std::cout << "Mask with excluded CoreSettings:\n";
         TestClassTreeMask(test13_20);
 

code/branches/core2/src/orxonox/core/CMakeLists.txt

@@ -11 +11 @@
   SignalHandler.cc
   ArgReader.cc
-  DebugLevel.cc
+  CoreSettings.cc
   OutputHandler.cc
   Language.cc

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

@@ -35 +35 @@
 #include "ConfigValueContainer.h"
 #include "Language.h"
+#include "Identifier.h"
 #include "util/SubString.h"
 #include "util/Convert.h"

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

@@ -100 +100 @@
   class ConfigFileSection;
   class ConfigValueContainer;
-  class DebugLevel;
+  class CoreSettings;
   class Error;
   class Executor;

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

@@ -113 +113 @@
             virtual void updateConfigValues() const = 0;
 
-            /** @brief Removes all objects of the corresponding class. */
-            virtual void removeObjects() const = 0;
-
             /** @brief Returns the name of the class the Identifier belongs to. @return The name */
             inline const std::string& getName() const { return this->name_; }
@@ -306 +303 @@
             ClassIdentifier<T>* registerClass(std::set<const Identifier*>* parents, const std::string& name, bool bRootClass);
             void addObject(T* object);
-            void removeObjects() const;
             void setName(const std::string& name);
             /** @brief Returns the list of all existing objects of this class. @return The list */
@@ -394 +390 @@
         COUT(5) << "*** ClassIdentifier: Added object to " << this->getName() << "-list." << std::endl;
         object->getMetaList().add(this->objects_, this->objects_->add(object));
-    }
-
-    /**
-        @brief Removes all objects of the corresponding class.
-    */
-    template <class T>
-    void ClassIdentifier<T>::removeObjects() const
-    {
-        for (Iterator<T> it = this->objects_->start(); it;)
-            delete *(it++);
     }
 

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

@@ -28 +28 @@
 /**
     @file Language.cc
-    @brief Implementation of the Language and the LanguageEntry class.
+    @brief Implementation of the Language and the LanguageEntry classes.
 */
 
 #include <fstream>
 
-#include "CoreIncludes.h"
 #include "Language.h"
-#include "ConfigValueIncludes.h"
+#include "CoreSettings.h"
 
 namespace orxonox
@@ -48 +47 @@
     LanguageEntry::LanguageEntry(const std::string& fallbackEntry)
     {
-        RegisterRootObject(LanguageEntry);
-
         this->fallbackEntry_ = fallbackEntry;
         this->localisedEntry_ = fallbackEntry; // Set the localisation to the fallback entry, for the case that no translation gets assigned
@@ -92 +89 @@
     Language::Language()
     {
-        RegisterRootObject(Language);
-
         this->defaultLanguage_ = "default";
         this->defaultLocalisation_ = "ERROR: LANGUAGE ENTRY DOESN'T EXIST!";
@@ -102 +97 @@
 
     /**
-        @brief Function to collect the SetConfigValue-macro calls.
-    */
-    void Language::setConfigValues()
-    {
-        SetConfigValue(language_, this->defaultLanguage_).description("The language of the ingame text");
-
-        // Read the translation file after the language was configured
-        this->readTranslatedLanguageFile();
-    }
-
-    /**
         @brief Returns a reference to the only existing instance of the Language class and calls the setConfigValues() function.
         @return The reference to the only existing instance
@@ -118 +102 @@
     Language& Language::getLanguage()
     {
-        // Use static variables to avoid conflicts while executing this code before main()
-        static Language theOnlyLanguageObject = Language();
-        static bool bCreatingTheOnlyLanguageObject = true;
-
-        // This workaround is used to set a description of the own config value without creating an infinite recursion
-        if (bCreatingTheOnlyLanguageObject)
-        {
-            bCreatingTheOnlyLanguageObject = false;
-            theOnlyLanguageObject.setConfigValues();
-        }
-
-        return theOnlyLanguageObject;
+        static Language instance = Language();
+        return instance;
     }
 
@@ -267 +241 @@
     void Language::readTranslatedLanguageFile()
     {
-        COUT(4) << "Read translated language file (" << this->language_ << ")." << std::endl;
+        COUT(4) << "Read translated language file (" << CoreSettings::getLanguage() << ")." << std::endl;
 
         // Open the file
         std::ifstream file;
-        file.open(getFileName(this->language_).c_str(), std::fstream::in);
+        file.open(getFileName(CoreSettings::getLanguage()).c_str(), std::fstream::in);
 
         if (!file.is_open())
         {
             COUT(1) << "An error occurred in Language.cc:" << std::endl;
-            COUT(1) << "Error: Couldn't open file " << getFileName(this->language_) << " to read the translated language entries!" << std::endl;
-            ResetConfigValue(language_);
+            COUT(1) << "Error: Couldn't open file " << getFileName(CoreSettings::getLanguage()) << " to read the translated language entries!" << std::endl;
+            CoreSettings::resetLanguage();
             COUT(3) << "Info: Reset language to " << this->defaultLanguage_ << "." << std::endl;
             return;
@@ -308 +282 @@
                 else
                 {
-                    COUT(2) << "Warning: Invalid language entry \"" << lineString << "\" in " << getFileName(this->language_) << std::endl;
+                    COUT(2) << "Warning: Invalid language entry \"" << lineString << "\" in " << getFileName(CoreSettings::getLanguage()) << std::endl;
                 }
             }
@@ -335 +309 @@
 
         // Iterate through the list an write the lines into the file
-        for (Iterator<LanguageEntry> it = ObjectList<LanguageEntry>::start(); it; ++it)
-        {
-            file << it->getLabel() << "=" << it->getDefault() << std::endl;
+        for (std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.begin(); it != this->languageEntries_.end(); ++it)
+        {
+            file << (*it).second->getLabel() << "=" << (*it).second->getDefault() << std::endl;
         }
 

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

@@ -49 +49 @@
 
 #include "CorePrereqs.h"
-#include "OrxonoxClass.h"
 
 
@@ -65 +64 @@
     // ###############################
     //! The LanguageEntry class stores the default- and the translated string of a given entry in the language file.
-    class _CoreExport LanguageEntry : public OrxonoxClass
+    class _CoreExport LanguageEntry
     {
         public:
@@ -112 +111 @@
     // ###############################
     //! The Language class manges the language files and entries and stores the LanguageEntry objects in a map.
-    class _CoreExport Language : public OrxonoxClass
+    class _CoreExport Language
     {
-        template <class T>
-        friend class ClassIdentifier; // forward declaration because of the private destructor
+        friend class CoreSettings;
 
         public:
             static Language& getLanguage();
-            void setConfigValues();
             void addEntry(const LanguageEntryLabel& label, const std::string& entry);
             const std::string& getLocalisation(const LanguageEntryLabel& label) const;
@@ -134 +131 @@
             LanguageEntry* createEntry(const LanguageEntryLabel& label, const std::string& entry);
 
-            std::string language_;                                  //!< The configured language
             std::string defaultLanguage_;                           //!< The default language
             std::string defaultLocalisation_;                       //!< The returned string, if an entry unavailable entry is requested

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

@@ -31 +31 @@
 */
 
-#include "DebugLevel.h"
+#include "CoreSettings.h"
 #include "OutputHandler.h"
 #include "ConsoleCommand.h"
@@ -77 +77 @@
     int OutputHandler::getSoftDebugLevel(OutputHandler::OutputDevice device)
     {
-        return DebugLevel::getSoftDebugLevel(device);
+        return CoreSettings::getSoftDebugLevel(device);
     }