Changeset 5747 for code/trunk/src/libraries/util

Timestamp:

Sep 19, 2009, 11:17:51 PM (15 years ago)

Author:

rgrieder

Message:

Added Exception::handleMessage() (copy from Game::getExceptionMessage) function that returns the exception message (if retrievable) when catching with "…"
and adjusted some exception handlers.

Location:

code/trunk/src/libraries/util

Files:

• CMakeLists.txt (modified) (1 diff)
• Exception.cc (modified) (2 diffs)
• Exception.h (modified) (1 diff)

code/trunk/src/libraries/util/CMakeLists.txt

@@ -74 +74 @@
     "UTIL_SHARED_BUILD"
   LINK_LIBRARIES
+    ${CEGUI_LIBRARY}
     ${OGRE_LIBRARY}
   SOURCE_FILES

code/trunk/src/libraries/util/Exception.cc

@@ -34 +34 @@
 
 #include "Exception.h"
+#include <CEGUIExceptions.h>
 
 namespace orxonox
@@ -93 +94 @@
         return getDescription().c_str();
     }
+
+    /*static*/ std::string Exception::handleMessage()
+    {
+        try
+        {
+            // rethrow
+            throw;
+        }
+        catch (const std::exception& ex)
+        {
+            return ex.what();
+        }
+        catch (const CEGUI::Exception& ex)
+        {
+#if CEGUI_VERSION_MAJOR == 0 && CEGUI_VERSION_MINOR < 6
+            return GeneralException(ex.getMessage().c_str()).getDescription();
+#else
+            return GeneralException(ex.getMessage().c_str(), ex.getLine(),
+                ex.getFileName().c_str(), ex.getName().c_str()).getDescription();
+#endif
+        }
+        catch (...)
+        {
+            return "Unknown exception";
+        }
+    }
 }

code/trunk/src/libraries/util/Exception.h

@@ -83 +83 @@
         virtual const std::string& getFilename()        const { return this->filename_; }
 
+        /**
+        @brief
+            Retrieves information from an exception caught with "..."
+            Works for std::exception and CEGUI::Exception
+        @remarks
+            Never ever call this function without an exception in the stack!
+        */
+        static std::string handleMessage();
+
     protected:
         std::string description_;             //!< User typed text about why the exception occurred