X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fapp%2FComponent.cpp;h=c8d0fbcc0ba585fe246d91e0fa5899dde437a940;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=3e8b3756b87ed19e5b99d0b9702eb7caca8b3801;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/app/Component.cpp b/source/app/Component.cpp
index 3e8b375..c8d0fbc 100644
--- a/source/app/Component.cpp
+++ b/source/app/Component.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// 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 Google Inc. 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 <algorithm>
@@ -48,7 +20,7 @@ using namespace std;
 using namespace anna;
 
 app::Component::Component(const char* className) :
-  a_className(className),
+  anna::Component(className),
   a_state(State::Stopped) {
   Application& app(app::functions::getApp());
 
@@ -60,7 +32,7 @@ app::Component::Component(const char* className) :
     }
   } else if(Logger::isActive(Logger::Warning) == true) {
     string msg(asString());
-    msg += " | Not connected to applicatino yet";
+    msg += " | Application already running. You may initialize this component manually (lazy initialization)";
     Logger::warning(msg, ANNA_FILE_LOCATION);
   }
 }
@@ -74,7 +46,7 @@ app::Component::~Component() {
 }
 
 void app::Component::addPredecessor(const char* componentName)
-throw() {
+{
   const std::string name(componentName);
 
   if((find(begin(), end(), name)) != end())
@@ -91,7 +63,7 @@ throw() {
 }
 
 void app::Component::initialize()
-throw(RuntimeException) {
+noexcept(false) {
   if(a_state == State::Running)
     return;
 
@@ -133,24 +105,17 @@ throw(RuntimeException) {
 }
 
 void app::Component::attach()
-throw(RuntimeException) {
+noexcept(false) {
   app::functions::getApp().attach(this);
 }
 
 std::string app::Component::asString() const
-throw() {
-  std::string result("app::Component { Name: ");
-  result += a_className;
-  result += " | Reference: ";
-  result += functions::asHexString(anna_ptrnumber_cast(this));
-  return result += " }";
+{
+  return anna::Component::asString();
 }
 
 xml::Node* app::Component::asXML(xml::Node* parent) const
-throw() {
-  xml::Node* result = parent->createChild("app.Component");
-  result->createAttribute("Name", a_className);
-  result->createAttribute("Reference", functions::asHexString(anna_ptrnumber_cast(this)));
-  return result;
+{
+  return anna::Component::asXML(parent);
 }