X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FComponentManager.cpp;h=1607d9d2c0788dfd4732004f82c6eb0a3e75349d;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=9528634254b1a46013104be0dbcb1ff092569aa5;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/source/core/util/ComponentManager.cpp b/source/core/util/ComponentManager.cpp
index 9528634..1607d9d 100644
--- a/source/core/util/ComponentManager.cpp
+++ b/source/core/util/ComponentManager.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     *  Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #include <anna/config/defines.hpp>
@@ -47,7 +19,7 @@
 
 
 anna::Component* anna::ComponentManager::find(const char* className)
-throw() {
+{
   std::map <std::string, Component*>::iterator it = a_components.find(className);
 
   if(it != a_components.end()) return (*it).second;
@@ -56,7 +28,7 @@ throw() {
 }
 
 void anna::ComponentManager::attach(anna::Component* component)
-throw(anna::RuntimeException) {
+noexcept(false) {
   LOGMETHOD(anna::TraceMethod tm("anna::ComponentManager", "attach(component)", ANNA_FILE_LOCATION));
 
   if(component == NULL)
@@ -67,7 +39,8 @@ throw(anna::RuntimeException) {
 
   if(already) {
     LOGINFORMATION(
-      std::string msg(already->asString());
+      //std::string msg(already->asString());
+      std::string msg(already->getClassName());
       msg += " | Was previously attached !";
       anna::Logger::information(msg, ANNA_FILE_LOCATION);
     )
@@ -83,7 +56,7 @@ throw(anna::RuntimeException) {
 }
 
 void anna::ComponentManager::detach(anna::Component* component)
-throw(anna::RuntimeException) {
+noexcept(false) {
   LOGMETHOD(anna::TraceMethod tm("anna::ComponentManager", "detach(component)", ANNA_FILE_LOCATION));
 
   if(component == NULL)
@@ -110,7 +83,7 @@ throw(anna::RuntimeException) {
 }
 
 anna::xml::Node* anna::ComponentManager::asXML(anna::xml::Node* parent) const
-throw() {
+{
   anna::xml::Node* node(NULL);
   node = parent->createChild("anna.Components");
   std::map <std::string, Component*>::const_iterator it;